审批管理

package.json

@@ -35,6 +35,7 @@
     "vue-draggable-resizable": "^2.3.0",
     "vue-json-editor": "^1.4.3",
     "vue-ruler-tool": "^1.2.4",
+    "vue-style-loader": "^4.1.3",
     "vuedraggable": "^2.24.3"
   },
   "devDependencies": {
@@ -59,7 +60,6 @@
     "v-viewer": "^1.6.4",
     "vue": "^2.6.14",
     "vue-router": "^3.3.4",
-    "vue-style-loader": "^4.1.3",
     "vue-template-compiler": "^2.6.14",
     "vuex": "^3.5.1",
     "vuex-persistedstate": "^2.7.1"

project/hlj/app/AppFormAudit/components/List.vue

@@ -22,7 +22,8 @@
           <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
             <template slot-scope="{ row }">
               <div class="table-options">
-                <el-button type="text" @click="toDetail(row.id)">查看</el-button>
+                <el-button type="text" @click="edit(row)">编辑</el-button>
+                <el-button type="text" @click="remove(row.id)">删除</el-button>
               </div>
             </template>
           </el-table-column>
@@ -38,7 +39,7 @@
           <el-form-item label="分组名称" style="width: 100%" prop="name" :rules="[{required: true, message: '请输入分组名称', trigger: 'blur'}]">
             <el-input v-model="form.name" size="small" placeholder="请输入分组名称"></el-input>
           </el-form-item>
-          <el-form-item label="评分人员" style="width: 100%" prop="examineUserNames" :rules="[{required: true, message: '请选择评分人员', trigger: 'change'}]">
+          <el-form-item label="填报人员" style="width: 100%" prop="examineUserNames" :rules="[{required: true, message: '请选择填报人员', trigger: 'change'}]">
             <ai-user-selecter :instance="instance" v-model="form.examineUserIds" @change="e => onUserChange(e, 'examineUserNames')">
               <div class="AppAnnounceDetail-select">
                 <el-input class="AppAnnounceDetail-select__input" size="small" placeholder="请选择..." v-model="form.examineUserNames"></el-input>
@@ -90,9 +91,11 @@
           examineUserNames: '',
           fillingUserNames: ''
         },
+        id: '',
         colConfigs: [
-          { prop: 'title', label: '模板名称' },
+          { prop: 'name', label: '审批分组' },
-          { prop: 'updateTime', align: 'center', label: '更新时间' }
+          { prop: 'examineUserNames', align: 'center', label: '填报人员' },
+          { prop: 'fillingUserNames', align: 'center', label: '审批人员' }
         ],
         isShow: false,
         tableData: [],
@@ -128,6 +131,38 @@
         })
       },
 
+      edit (e) {
+        this.id = e.id
+        this.form.name = e.name
+        this.form.examineUserIds = e.examineUserIds.split(',').map((v, index) => {
+          return {
+            id: v,
+            name: e.examineUserNames.split(',')[index]
+          }
+        })
+        this.form.fillingUserIds = e.fillingUserIds.split(',').map((v, index) => {
+          return {
+            id: v,
+            name: e.fillingUserNames.split(',')[index]
+          }
+        })
+
+        this.form.examineUserNames = 1
+        this.form.fillingUserNames = 1
+        this.isShow = true
+      },
+
+      remove (id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appassessmentscorev2examinegroup/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+
       onUserChange(e, type) {
         if (e.length) {
           this.form[type] = '1'
@@ -137,6 +172,7 @@
       },
 
       onClose () {
+        this.id = ''
         this.form.name = ''
         this.form.fillingUserIds = []
         this.form.examineUserIds = []
@@ -149,8 +185,11 @@
           if (valid) {
             this.instance.post(`/app/appassessmentscorev2examinegroup/addOrUpdate`, {
               ...this.form,
-              fillingUserIds: this.form.fillingUserIds.map(v => v.id),
+              id: this.id || '',
-              examineUserIds: this.form.examineUserIds.map(v => v.id)
+              fillingUserIds: this.form.fillingUserIds.map(v => v.id).join(','),
+              examineUserIds: this.form.examineUserIds.map(v => v.id).join(','),
+              fillingUserNames: this.form.fillingUserIds.map(v => v.name).join(','),
+              examineUserNames: this.form.examineUserIds.map(v => v.name).join(',')
             }).then(res => {
               if (res.code == 0) {
                 this.$message.success('提交成功！')
@@ -161,15 +200,6 @@
             })
           }
         })
-      },
-
-      toAdd (id) {
-        this.$emit('change', {
-          type: 'Add',
-          params: {
-            id: id || ''
-          }
-        })
       }
     }
   }

project/hlj/app/AppRecoScore/components/Detail.vue

@@ -49,7 +49,7 @@
             :tableData="tableData"
             :col-configs="colConfigs"
             @getList="getList">
-            <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+            <el-table-column slot="options" width="120px" fixed="right" label="操作" align="center">
               <template slot-scope="{ row }">
                 <div class="table-options">
                   <el-button type="text" @click="toDetail(row.id)">详情</el-button>
@@ -89,43 +89,22 @@
         isLoading: false,
         tableData: [],
         colConfigs: [
-          {prop: 'templateName', label: '表单名称', align: 'center', width: 220 },
+          {prop: 'templateName', label: '参评人员', align: 'center' },
-          {prop: 'createUserName', label: '添加人', align: 'center', width: 150 },
+          {prop: 'createUserName', label: '提交时间', align: 'center', width: 150 },
+          {prop: 'createUserName', label: '总分', align: 'center' },
           {
             prop: 'status',
             align: 'center',
-            width: 320,
+            label: '审核状态',
-            label: '开始结束时间',
-            render: (h, {row}) => {
-              return h('span', {
-              }, `${row.beginTime} - ${row.endTime}`)
-            }
-          },
-          {
-            prop: 'status',
-            align: 'center',
-            label: '已填写/剩余份数',
             render: (h, {row}) => {
               return h('span', {
                 style: {
-                  width: '300px'
+                  color: this.dict.getColor('ampvFilled', row.status)
                 }
-              }, `${row.overPhr}/${row.totalPhr - row.overPhr}`)
+              }, this.dict.getLabel('ampvFilled', row.status))
             }
           },
-          {
+          {prop: 'createUserName', label: '审核人', align: 'center' },
-            prop: 'status',
-            align: 'center',
-            label: '任务状态',
-            width: 100,
-            render: (h, {row}) => {
-              return h('span', {
-                style: {
-                  color: this.dict.getColor('formStatus', row.status)
-                }
-              }, this.dict.getLabel('formStatus', row.status))
-            }
-          }
         ],
         list: []
       }