202505301641

ruoyi-ui/src/views/system/Cooperate/index.vue

@@ -53,7 +53,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+<!-- 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -88,7 +88,7 @@
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="CooperateList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -154,8 +154,13 @@
     <!-- 添加或修改企业合作对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="ID" prop="id" v-if="form.id">
+          <el-input v-model="form.id" disabled />
+        </el-form-item>
         <el-form-item label="用户" prop="uid">
-          <el-input v-model="form.uid" placeholder="请输入用户" />
+          <el-select v-model="form.uid" placeholder="请选择用户" clearable filterable style="width: 100%">
+            <el-option v-for="item in userDataList" :key="item.id" :label="item.name" :value="item.id" />
+          </el-select>
         </el-form-item>
         <el-form-item label="公司名称" prop="company">
           <el-input v-model="form.company" placeholder="请输入公司名称" />
@@ -170,33 +175,14 @@
           <el-input v-model="form.address" placeholder="请输入地址" />
         </el-form-item>
         <el-form-item label="合作意向" prop="info">
-          <el-input v-model="form.info" placeholder="请输入合作意向" />
+          <el-input type="textarea" v-model="form.info" placeholder="请输入合作意向" :rows="3" />
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio
+            <el-radio :label="1">待处理</el-radio>
-              v-for="dict in dict.type.coupons_status"
+            <el-radio :label="0">已处理</el-radio>
-              :key="dict.value"
-              :label="parseInt(dict.value)"
-            >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="${comment}" prop="createdAt">
-          <el-date-picker clearable
-                          v-model="form.createdAt"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="${comment}" prop="updatedAt">
-          <el-date-picker clearable
-                          v-model="form.updatedAt"
-                          type="date"
-                          value-format="yyyy-MM-dd"
-                          placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -248,33 +234,33 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        uid: [
-          { required: true, message: "用户不能为空", trigger: "blur" }
-        ],
-        company: [
-          { required: true, message: "公司名称不能为空", trigger: "blur" }
-        ],
         name: [
           { required: true, message: "姓名不能为空", trigger: "blur" }
         ],
         phone: [
           { required: true, message: "电话不能为空", trigger: "blur" }
         ],
+        company: [
+          { required: true, message: "公司名称不能为空", trigger: "blur" }
+        ],
         address: [
           { required: true, message: "地址不能为空", trigger: "blur" }
         ],
         info: [
           { required: true, message: "合作意向不能为空", trigger: "blur" }
         ],
-        status: [
+        uid: [
-          { required: true, message: "状态不能为空", trigger: "change" }
+          { required: true, message: "请选择用户", trigger: "change" }
         ],
+        status: [
+          { required: true, message: "请选择状态", trigger: "change" }
+        ]
       }
     }
   },
   created() {
     this.getList()
-    this.getuserDataList()
+    this.getUserDataList()
   },
   methods: {
     /** 查询企业合作列表 */
@@ -286,6 +272,12 @@ export default {
         this.loading = false
       })
     },
+    // 获取用户列表
+    getUserDataList() {
+      getUserDataList("1").then(response => {
+        this.userDataList = response.data
+      })
+    },
     // 取消按钮
     cancel() {
       this.open = false
@@ -323,11 +315,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    getuserDataList(){
-      getUserDataList("1").then(response => {
-        this.userDataList = response.data
-      })
-    },
     // 任务状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用"

ruoyi-ui/src/views/system/IntegralLog/index.vue

@@ -35,7 +35,7 @@
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
       </el-form-item>
     </el-form>
-
+<!-- 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
@@ -70,7 +70,7 @@
         >删除</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
+    </el-row> -->
 
     <el-table v-loading="loading" :data="IntegralLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
@@ -94,7 +94,7 @@
           <span>{{ parseTime(scope.row.updatedAt, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -111,7 +111,7 @@
             v-hasPermi="['system:IntegralLog:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

ruoyi-ui/src/views/system/PayMoneyLog/index.vue

@@ -45,7 +45,7 @@
           <span>{{ parseTime(scope.row.payTime, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -62,7 +62,7 @@
             v-hasPermi="['system:PayMoneyLog:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination

ruoyi-ui/src/views/system/transfer/index.vue

@@ -122,7 +122,7 @@
           <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <!-- <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
             size="mini"
@@ -139,7 +139,7 @@
             v-hasPermi="['system:transfer:remove']"
           >删除</el-button>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination