新组件引入

src/pages/main/gridDivision/components/form.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author       : yuanrunwei
  * @Date         : 2021-11-01 18:03:02
- * @LastEditors  : yuanrunwei
- * @LastEditTime : 2021-12-04 17:53:54
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2022-01-07 19:16:35
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\form.vue
 -->
 <template>
@@ -29,7 +29,7 @@
                             ></el-option>
                         </el-select>
                     </template>
-                    <template v-else-if="['date', 'month'].includes(type)">
+                    <template v-else-if="['datetime','date', 'month'].includes(type)">
                         <el-date-picker
                             v-model="object[props]"
                             :type="type"

src/pages/main/gridDivision/components/table.vue

@@ -2,7 +2,7 @@
  * @Author       : yuanrunwei
  * @Date         : 2021-11-01 18:02:58
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2022-01-06 12:02:24
+ * @LastEditTime: 2022-01-10 09:38:20
  * @FilePath     : \spfm-market-front\src\pages\main\performance\components\table.vue
 -->
 <template>
@@ -28,12 +28,16 @@
             @change="handleModify"
           />
         </div>
+        <div v-if="type === 'number'">{{ scope.$index + 1 }}</div>
         <div v-else-if="type === 'textarea'">
           <pre class="simple-table-break">{{ scope.row[props] }}</pre>
         </div>
         <div v-else-if="type === 'date'">
           <div>{{ $formatDate(scope.row[props], "YYYY-MM-DD") }}</div>
         </div>
+        <div v-else-if="type === 'time'">
+          <div>{{ $formatDate(scope.row[props], "YYYY-MM-DD HH:00:00") }}</div>
+        </div>
         <div v-else-if="type === 'click'">
           <div
             class="simple-table-click cursor-pointer"
@@ -73,6 +77,7 @@
     <el-table-column
       v-if="handleRow.length"
       label="操作"
+      :align="'center'"
       :width="handleRow.length * 50"
     >
       <template slot-scope="scope">
@@ -85,7 +90,7 @@
             <el-popconfirm
               v-if="popconfirm"
               :title="`确定要${label}吗？`"
-              @confirm="handleClick(props, scope.row)"
+              @onConfirm="handleClick(props, scope.row)"
               @cancel="handleCancel"
             >
               <el-button slot="reference" type="text" size="small">{{
@@ -150,14 +155,13 @@ export default {
       return visible;
     },
     handleClick(props, row) {
-      console.log("aaaaaaaaa");
       this.$emit(props, row);
     },
     handleCancel() {
       console.log("我被关闭了");
     },
-    handleSelectionChange(val){
-        this.$emit("selection",val)
+    handleSelectionChange(val) {
+      this.$emit("selection", val);
     },
     handleModify() {
       this.$emit("modify", this.computed_list);

src/pages/main/gridDivision/workersList.vue

@@ -392,7 +392,7 @@ export default {
     // 编辑按钮
     handleEdit(row) {
       let id = row.id;
-      this.handleVisible('edit')
+      let type = row.parentId === '0' ? '0' : '1'
       this.$http({
         url: "/mkWangge/getMkWanggeById",
         method: "get",
@@ -400,17 +400,22 @@ export default {
           "Content-Type": "application/json",
         },
         params:{
-          id
+          id,
+          type
         }
       }).then(({data})=>{
-        console.log(data);
+        let body = data.body
+        console.log(body,'body');
         this.add_form = {
-          id: data.id,
-          proposer: data.proposer,
-          telephone: data.telephone,
-          wanggeText: data.wanggeText,
+          id: body.id,
+          proposer: body.createName,
+          telephone: body.telephone,
+          wanggeText: body.wanggeText,
         }
+        this.table_list_approve = body.bpmTaskList
       })
+      console.log(this.table_list_approve,'table_list_approve');
+      this.handleVisible('edit')
     },
     handleSubmit() {
       console.log(this.add_form);