修改生产考核表选项的值不能传递的问题

oa-ui/src/views/flowable/form/cwForm.vue

@@ -2,7 +2,7 @@
  * @Author: ysh
  * @Date: 2024-01-19 16:29:01
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-02-21 10:54:40
+ * @LastEditTime: 2024-02-23 09:48:28
 -->
 <template>
   <div>
@@ -127,12 +127,11 @@ export default {
       MessageBox.confirm('确认提交？', '任务提交', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
         tableForm.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
         tableForm.disabled = true;
-        console.log(tableForm);
         let formData = new FormData();
         let form = JSON.stringify(tableForm);
         formData.append("form", form);
         submitAssess(formData).then(res => {
-        debugger
+        
           this.taskOpen = false;
           this.$emit('submit', tableForm);
         });

oa-ui/src/views/flowable/form/cwTable.vue

@@ -60,7 +60,8 @@
       </tr>
       <tr>
         <td class="table-title">入职年月</td>
-        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate != null ? tableForm.entryDate.substring(0,10):tableForm.entryDate }}</td>
+        <td style="text-align:left;padding-left:10px;">{{ tableForm.entryDate != null ?
+          tableForm.entryDate.substring(0, 10) : tableForm.entryDate }}</td>
         <td class="table-title">年龄</td>
         <td style="text-align:left;padding-left:10px;">{{ tableForm.age }}</td>
       </tr>
@@ -89,15 +90,15 @@
         </td>
         <td rowspan="8">
           <el-radio-group v-model="tableForm.familiar01" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar01',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar01',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar01',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
 
         <td rowspan="8">
           <div v-if="!isStaff">{{ tableForm.remark01 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark01"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark01" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="8">
           <el-radio-group v-model="tableForm.workload01" :disabled="!isPiLeader">
@@ -194,14 +195,14 @@
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar02" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar02',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar02',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar02',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
           <div v-if="!isStaff">{{ tableForm.remark02 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark02"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark02" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.workload02" :disabled="!isPiLeader">
@@ -257,14 +258,14 @@
         </td>
         <td rowspan="7">
           <el-radio-group v-model="tableForm.familiar03" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar03',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar03',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar03',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="7">
           <div v-if="!isStaff">{{ tableForm.remark03 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark03"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark03" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="7">
           <el-radio-group v-model="tableForm.workload03" :disabled="!isPiLeader">
@@ -350,14 +351,14 @@
         </td>
         <td rowspan="8">
           <el-radio-group v-model="tableForm.familiar04" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar04',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar04',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar04',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="8">
           <div v-if="!isStaff">{{ tableForm.remark04 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark04"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark04" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="8">
           <el-radio-group v-model="tableForm.workload04" :disabled="!isPiLeader">
@@ -451,14 +452,14 @@
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar05" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
           <div v-if="!isStaff">{{ tableForm.remark05 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark05"  type="textarea" :rows="4"></el-input>
+          <el-input v-if="isStaff" v-model="tableForm.remark05" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.workload05" :disabled="!isPiLeader">
@@ -535,8 +536,8 @@ export default {
       type: Object,
       required: true
     },
-    taskName:{
-      type:String
+    taskName: {
+      type: String
     }
   },
   watch: {
@@ -565,10 +566,10 @@ export default {
   },
   methods: {
     initForm() {
-      console.log(this.tableForm);
+
     },
     formatForm() {
-      debugger
+
       if (this.taskName == '负责人审核') {
         this.isPiLeader = true;
         this.isDeptLeader = false;
@@ -592,19 +593,49 @@ export default {
       }
     },
     submit() {
+      this.formValidate(this.tableForm)
       this.$emit('submit', this.tableForm);
     },
-    cancelSelect(value, name) {
-      debugger
-      if (!this.isPiLeader) {
+    formValidate(form) {
+      let flag = [];
+      for (let f in form) {
+        
+        if (f.startsWith('familiar') && form[f] != null) {
+          flag.push(f.slice(-2));
+        } else if (f.length == 5 && f.startsWith('f')) {
+          if (form[f] != "" && form[f] != undefined && form[f] != null)
+            flag.push(f.substring(1, 3));
+        }
+      }
+      let isF = false;
+      if (flag.length == 0) {
+        this.$modal.msgError("表格未填写，请填写表格");
         return
       }
-      if (this.tableForm[name] == value) {
-        this.tableForm[name] = null
-      } else {
-
-        if (this.tableForm[name] !== undefined)
-          this.tableForm[name] = value
+    },
+    cancelSelect(value, name, disabled) {
+      
+      if (this.isStaff) {
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+          else {
+            this.$set(this.tableForm, name, value)
+          }
+        }
+      }
+      if (this.isPiLeader) {
+        if (disabled) {
+          return
+        }
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+        }
       }
     }
   },

oa-ui/src/views/flowable/form/jsForm.vue

@@ -128,12 +128,11 @@ export default {
       MessageBox.confirm('确认提交？', '任务提交', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
         tableForm.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
         tableForm.disabled = true;
-        console.log(tableForm);
         let formData = new FormData();
         let form = JSON.stringify(tableForm);
         formData.append("form", form);
         submitAssess(formData).then(res => {
-        debugger
+        
           this.taskOpen = false;
           this.$emit('submit', tableForm);
         });

oa-ui/src/views/flowable/form/jsTable.vue

@@ -89,9 +89,9 @@
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.familiar01" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar01',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar01',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar01',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         
@@ -187,9 +187,9 @@
         </td>
         <td rowspan="4">
           <el-radio-group v-model="tableForm.familiar02" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar02',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar02',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar02',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="4">
@@ -267,9 +267,9 @@
         </td>
         <td rowspan="13">
           <el-radio-group v-model="tableForm.familiar03" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar03',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar03',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar03',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="13">
@@ -420,9 +420,9 @@
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.familiar04" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar04',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar04',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar04',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="5">
@@ -509,9 +509,9 @@
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar05" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar05',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
@@ -658,24 +658,49 @@ export default {
       }
     },
     submit() {
-      if(!this.isStaff){
-        this.$emit('submit', this.tableForm);
-      }else{
-        this.$emit('submit', this.tableForm);
-      }
-      
+      this.formValidate(this.tableForm)
+      this.$emit('submit', this.tableForm);
     },
-    cancelSelect(value, name) {
-      debugger
-      if (!this.isPiLeader) {
+    formValidate(form) {
+      let flag = [];
+      for (let f in form) {
+        
+        if (f.startsWith('familiar') && form[f] != null) {
+          flag.push(f.slice(-2));
+        } else if (f.length == 5 && f.startsWith('f')) {
+          if (form[f] != "" && form[f] != undefined && form[f] != null)
+            flag.push(f.substring(1, 3));
+        }
+      }
+      let isF = false;
+      if (flag.length == 0) {
+        this.$modal.msgError("表格未填写，请填写表格");
         return
       }
-      if (this.tableForm[name] == value) {
-        this.tableForm[name] = null
-      } else {
-
-        if (this.tableForm[name] !== undefined)
-          this.tableForm[name] = value
+    },
+    cancelSelect(value, name, disabled) {
+      
+      if (this.isStaff) {
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+          else {
+            this.$set(this.tableForm, name, value)
+          }
+        }
+      }
+      if (this.isPiLeader) {
+        if (disabled) {
+          return
+        }
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+        }
       }
     }
   },

oa-ui/src/views/flowable/form/jyForm.vue

@@ -127,12 +127,11 @@ export default {
       MessageBox.confirm('确认提交？', '任务提交', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
         tableForm.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
         tableForm.disabled = true;
-        console.log(tableForm);
         let formData = new FormData();
         let form = JSON.stringify(tableForm);
         formData.append("form", form);
         submitAssess(formData).then(res => {
-        debugger
+        
           this.taskOpen = false;
           this.$emit('submit', tableForm);
         });

oa-ui/src/views/flowable/form/jyTable.vue

@@ -93,9 +93,9 @@
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.familiar01" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar01',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar01',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar01',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         
@@ -178,9 +178,9 @@
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar02" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar02',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar02',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar02',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
@@ -237,9 +237,9 @@
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.familiar03" :disabled="!isStaff">
-            <div><el-radio :label="0">生疏</el-radio></div>
-            <div><el-radio :label="2">熟练</el-radio></div>
-            <div><el-radio :label="3">精通</el-radio></div>
+            <div><el-radio :label="0" @click.native.prevent="cancelSelect(0, 'familiar03',!isStaff)">生疏</el-radio></div>
+            <div><el-radio :label="2" @click.native.prevent="cancelSelect(2, 'familiar03',!isStaff)">熟练</el-radio></div>
+            <div><el-radio :label="3" @click.native.prevent="cancelSelect(3, 'familiar03',!isStaff)">精通</el-radio></div>
           </el-radio-group>
         </td>
         <td rowspan="3">
@@ -373,24 +373,49 @@ export default {
       }
     },
     submit() {
-      if(!this.isStaff){
-        this.$emit('submit', this.tableForm);
-      }else{
-        this.$emit('submit', this.tableForm);
-      }
-      
+      this.formValidate(this.tableForm)
+      this.$emit('submit', this.tableForm);
     },
-    cancelSelect(value, name) {
-      debugger
-      if (!this.isPiLeader) {
+    formValidate(form) {
+      let flag = [];
+      for (let f in form) {
+        
+        if (f.startsWith('familiar') && form[f] != null) {
+          flag.push(f.slice(-2));
+        } else if (f.length == 5 && f.startsWith('f')) {
+          if (form[f] != "" && form[f] != undefined && form[f] != null)
+            flag.push(f.substring(1, 3));
+        }
+      }
+      let isF = false;
+      if (flag.length == 0) {
+        this.$modal.msgError("表格未填写，请填写表格");
         return
       }
-      if (this.tableForm[name] == value) {
-        this.tableForm[name] = null
-      } else {
-
-        if (this.tableForm[name] !== undefined)
-          this.tableForm[name] = value
+    },
+    cancelSelect(value, name, disabled) {
+      
+      if (this.isStaff) {
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+          else {
+            this.$set(this.tableForm, name, value)
+          }
+        }
+      }
+      if (this.isPiLeader) {
+        if (disabled) {
+          return
+        }
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+        }
       }
     }
   },

oa-ui/src/views/flowable/form/scForm.vue

@@ -150,7 +150,6 @@ export default {
       MessageBox.confirm('确认提交？', '任务提交', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
         tableForm.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
         tableForm.disabled = true;
-        console.log(tableForm);
         let formData = new FormData();
         let form = JSON.stringify(tableForm);
         formData.append("form", form);

oa-ui/src/views/flowable/form/scTable.vue

@@ -5,11 +5,19 @@
       <tr>
         <td class="table-title">项目编号</td>
         <td colspan="1" style="text-align:left;padding-left:10px;">
-          {{ tableForm.projectNumber }}
+          <div v-if="!isStaff">{{ tableForm.projectNumber }}</div>
+          <div v-if="isStaff">
+            <el-select v-model="tableForm.projectNumber" @change="getProjectById(tableForm.projectNumber)">
+              <el-option v-for="item in projectList" :key="item.projectId" :label="item.projectNumber"
+                :value="item.projectId">
+              </el-option>
+            </el-select>
+          </div>
         </td>
         <td class="table-title">项目名称</td>
         <td colspan="9" style="text-align:left;padding-left:10px;">
-          {{ tableForm.projectName }}
+          <div v-if="!isStaff">{{ tableForm.projectName }}</div>
+          <div v-if="isStaff">{{ tableForm.projectName }}</div>
         </td>
       </tr>
       <tr>
@@ -42,19 +50,25 @@
         <td class="table-title">部门职务</td>
         <td colspan="3" style="text-align:left;padding-left:10px;">{{ tableForm.postGroup }}</td>
         <td colspan="3" rowspan="5">
-          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice" :disabled="!isDeptLeader">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.deptAdvice"
+            :disabled="!isDeptLeader">
           </el-input>
           <el-row justify="center" type="flex">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人" :disabled="!isDeptLeader"></el-input> </el-col>
-            <el-col :span="12">日期：<el-date-picker type="date"  placeholder="请选择考核日期" v-model="tableForm.deptTime" style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
+            <el-col :span="12">考核人：<el-input v-model="tableForm.deptAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isDeptLeader"></el-input> </el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.deptTime"
+                style="width:150px;" :disabled="!isDeptLeader"></el-date-picker> </el-col>
           </el-row>
         </td>
         <td colspan="3" rowspan="5">
-          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice" :disabled="!isManager">
+          <el-input type="textarea" :rows="4" placeholder="请输入考核意见" v-model="tableForm.managerAdvice"
+            :disabled="!isManager">
           </el-input>
           <el-row justify="center">
-            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人" :disabled="!isManager"></el-input></el-col>
-            <el-col :span="12">日期：<el-date-picker type="date"  placeholder="请选择考核日期" v-model="tableForm.managerTime" style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
+            <el-col :span="12">考核人：<el-input v-model="tableForm.managerAssesser" style="width:150px;" placeholder="请输入考核人"
+                :disabled="!isManager"></el-input></el-col>
+            <el-col :span="12">日期：<el-date-picker type="date" placeholder="请选择考核日期" v-model="tableForm.managerTime"
+                style="width:150px;" :disabled="!isManager"></el-date-picker></el-col>
           </el-row>
         </td>
       </tr>
@@ -116,8 +130,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="5">
-          <div>{{ tableForm.remark01 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark01"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark01 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark01" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality01" :disabled="!isPiLeader">
@@ -203,8 +217,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="10">
-          <div>{{ tableForm.remark02 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark02"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark02 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark02" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="10">
           <el-radio-group v-model="tableForm.quality02" :disabled="!isPiLeader">
@@ -327,8 +341,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="5">
-          <div>{{ tableForm.remark03 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark03"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark03 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark03" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality03" :disabled="!isPiLeader">
@@ -411,8 +425,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="4">
-          <div>{{ tableForm.remark04 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark04"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark04 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark04" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="4">
           <el-radio-group v-model="tableForm.quality04" :disabled="!isPiLeader">
@@ -484,8 +498,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="6">
-          <div>{{ tableForm.remark05 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark05"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark05 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark05" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality05" :disabled="!isPiLeader">
@@ -572,8 +586,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="6">
-          <div>{{ tableForm.remark06 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark06"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark06 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark06" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality06" :disabled="!isPiLeader">
@@ -660,8 +674,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="4">
-          <div>{{ tableForm.remark07 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark07"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark07 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark07" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="4">
           <el-radio-group v-model="tableForm.quality07" :disabled="!isPiLeader">
@@ -733,8 +747,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="3">
-          <div>{{ tableForm.remark08 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark08"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark08 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark08" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="3">
           <el-radio-group v-model="tableForm.quality08" :disabled="!isPiLeader">
@@ -799,8 +813,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="6">
-          <div>{{ tableForm.remark09 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark09"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark09 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark09" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality09" :disabled="!isPiLeader">
@@ -888,8 +902,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="5">
-          <div>{{ tableForm.remark10 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark10"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark10 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark10" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality10" :disabled="!isPiLeader">
@@ -969,8 +983,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="6">
-          <div>{{ tableForm.remark11 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark11"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark11 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark11" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality11" :disabled="!isPiLeader">
@@ -1058,8 +1072,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="5">
-          <div>{{ tableForm.remark12 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark12"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark12 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark12" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality12" :disabled="!isPiLeader">
@@ -1139,8 +1153,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="6">
-          <div>{{ tableForm.remark13 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark13"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark13 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark13" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality13" :disabled="!isPiLeader">
@@ -1228,8 +1242,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="6">
-          <div>{{ tableForm.remark14 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark14"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark14 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark14" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality14" :disabled="!isPiLeader">
@@ -1317,8 +1331,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="6">
-          <div>{{ tableForm.remark15 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark15"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark15 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark15" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="6">
           <el-radio-group v-model="tableForm.quality15" :disabled="!isPiLeader">
@@ -1406,8 +1420,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="4">
-          <div>{{ tableForm.remark16 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark16"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark16 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark16" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="4">
           <el-radio-group v-model="tableForm.quality16" :disabled="!isPiLeader">
@@ -1478,8 +1492,8 @@
           </el-checkbox-group>
         </td>
         <td rowspan="5">
-          <div>{{ tableForm.remark17 }}</div>
-          <el-input v-if="isStaff" v-model="tableForm.remark17"  type="textarea" :rows="4"></el-input>
+          <div v-if="!isStaff">{{ tableForm.remark17 }}</div>
+          <el-input v-if="isStaff" v-model="tableForm.remark17" type="textarea" :rows="4"></el-input>
         </td>
         <td rowspan="5">
           <el-radio-group v-model="tableForm.quality17" :disabled="!isPiLeader">
@@ -1563,6 +1577,9 @@
 <script>
 import { SCContent } from '@/assets/datas/SCContent'
 import { getDicts as getDicts } from '@/api/system/dict/data'
+import { listProject } from '@/api/oa/project/project.js'
+import { getProject } from '@/api/oa/project/project'
+
 export default {
   dicts: ['cmc_role', 'cmc_skill', 'cmc_accessment'],
   props: {
@@ -1587,6 +1604,7 @@ export default {
       isPiLeader: false,
       isManager: false,
       isStaff: false,
+      projectList: [],
     }
   },
   created() {
@@ -1597,6 +1615,9 @@ export default {
   },
   methods: {
     initForm() {
+      listProject({ pageSize: 200 }).then(res => {
+        this.projectList = res.rows;
+      })
       for (let i = 0; i < SCContent.length + 1; i++) {
         if (i.toString().length == 1) {
           this.$set(this.form, 'role' + '0' + i, []);
@@ -1639,35 +1660,77 @@ export default {
         this.isStaff = true;
       }
     },
-    // 员工填报之后传值
+    // 员工修改之后传值
     assignmentToTableForm() {
-      debugger
-      for(let i in this.tableForm){
-        if(i.includes('role')){
+      for (let i in this.tableForm) {
+        if (i.includes('role')) {
           this.tableForm[i] = this.form[i]
         }
       }
     },
+    // 初始化tableForm，得到承担角色的值
+    initTableFormFromForm(){
+      for(let f in this.form){
+        if(this.form[f] != "" && this.form[f] != undefined && this.form[f] != null){
+          this.tableForm[f]  = this.form[f];
+        }
+      }
+    },
+    getProjectById(id) {
+      getProject(id).then(res => {
+        if (res.data != undefined) {
+          this.tableForm.projectName = res.data.projectName;
+          this.tableForm.projectNumber = res.data.projectNumber;
+          this.tableForm.projectId = id
+        }
+      })
+    },
     submit() {
-      if(!this.isStaff){
-        this.$emit('submit', this.tableForm);
-      }else{
+        this.formValidate(this.tableForm)
         this.assignmentToTableForm();
+        this.initTableFormFromForm();
+        console.log(this.tableForm);
         this.$emit('submit', this.tableForm);
-      }
-      
     },
-    cancelSelect(value, name) {
-      debugger
-      if (!this.isPiLeader) {
+    formValidate(form) {
+      let flag = [];
+      for (let f in form) {
+        if (f.startsWith('familiar') && form[f] != null) {
+          flag.push(f.slice(-2));
+        } else if (f.length == 5 && f.startsWith('f')) {
+          if (form[f] != "" && form[f] != undefined && form[f] != null)
+            flag.push(f.substring(1, 3));
+        }
+      }
+      let isF = false;
+      if (flag.length == 0) {
+        this.$modal.msgError("表格未填写，请填写表格");
         return
       }
-      if (this.tableForm[name] == value) {
-        this.tableForm[name] = null
-      } else {
-
-        if (this.tableForm[name] !== undefined)
-          this.tableForm[name] = value
+    },
+    cancelSelect(value, name, disabled) {
+      
+      if (this.isStaff) {
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+          else {
+            this.$set(this.tableForm, name, value)
+          }
+        }
+      }
+      if (this.isPiLeader) {
+        if (disabled) {
+          return
+        }
+        if (this.tableForm[name] == value) {
+          this.tableForm[name] = null
+        } else {
+          if (this.tableForm[name] !== undefined)
+            this.tableForm[name] = value
+        }
       }
     }
   },

oa-ui/src/views/flowable/form/xmForm.vue

@@ -127,12 +127,11 @@ export default {
       MessageBox.confirm('确认提交？', '任务提交', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
         tableForm.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
         tableForm.disabled = true;
-        console.log(tableForm);
         let formData = new FormData();
         let form = JSON.stringify(tableForm);
         formData.append("form", form);
         submitAssess(formData).then(res => {
-        debugger
+        
           this.taskOpen = false;
           this.$emit('submit', tableForm);
         });

oa-ui/src/views/flowable/form/xmTable.vue

@@ -401,7 +401,7 @@ export default {
       
     },
     cancelSelect(value, name) {
-      debugger
+      
       if (!this.isPiLeader) {
         return
       }

oa-ui/src/views/flowable/form/zhForm.vue

@@ -127,12 +127,11 @@ export default {
       MessageBox.confirm('确认提交？', '任务提交', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
         tableForm.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
         tableForm.disabled = true;
-        console.log(tableForm);
         let formData = new FormData();
         let form = JSON.stringify(tableForm);
         formData.append("form", form);
         submitAssess(formData).then(res => {
-        debugger
+        
           this.taskOpen = false;
           this.$emit('submit', tableForm);
         });

oa-ui/src/views/flowable/form/zhTable.vue

@@ -821,7 +821,7 @@ export default {
 
     },
     cancelSelect(value, name) {
-      debugger
+      
       if (!this.isPiLeader) {
         return
       }

oa-ui/src/views/flowable/task/finished/index.vue

@@ -174,8 +174,6 @@ export default {
     },
     /** 流程流转记录 */
     handleFlowRecord(row) {
-      console.log(row);
-
       getProcessVariables(row.taskId).then(res => {
         this.$router.push({
           path: '/flowable/task/finished/detail/index',

oa-ui/src/views/flowable/task/myProcess/index.vue

@@ -266,7 +266,7 @@ export default {
     handleStartProcess(row) {
       if (row.category == "assess") {
         getNextFlowNodeByStart({ deploymentId: row.deploymentId, variables: {} }).then(res => {
-          let data = res.data
+          let data = res.data;
           if (data.dataType === 'dynamic') {
             if (data.type === 'assignee') { // 指定人员
               this.checkSendUser = true;
@@ -289,12 +289,13 @@ export default {
             const formData = {};
             formData.disabled = true;
             formData.formBtns = false;
+            
             formData.formId = new Snowflake(1n, 1n, 0n).nextId().toString();
             if (row.id) {
               variables.variables = formData;
               // 启动流程并将表单数据加入流程变量
               definitionStart(row.id, JSON.stringify(variables)).then(res => {
-                debugger
+                
                 this.$modal.msgSuccess(res.msg);
                 let procInstanceId = res.data;
                 todoList({
@@ -305,7 +306,6 @@ export default {
                   if(records.length == 1){
                     records = records[0]
                   }
-                  console.log(records);
                   this.$router.push({
                     path: '/flowable/task/todo/detail/index',
                     query: {

oa-ui/src/views/flowable/task/myProcess/send/index.vue

@@ -122,8 +122,6 @@ export default {
     submits(form) {
       getNextFlowNodeByStart({ deploymentId: this.deployId, variables: {} }).then(res => {
         let data = res.data
-        debugger
-        console.log(form);
         if (data.dataType === 'dynamic') {
           if (data.type === 'assignee') { // 指定人员
             this.checkSendUser = true;
@@ -255,7 +253,7 @@ export default {
     },
     /** 提交流程 */
     submitTask() {
-      debugger
+      
       if (!this.checkValues && this.checkSendUser) {
         this.$modal.msgError("请选择任务接收!");
         return;

oa-ui/src/views/flowable/task/todo/detail/index.vue

@@ -253,7 +253,6 @@ export default {
       if (this.taskForm.taskId) {
         this.processVariables(this.taskForm.taskId)
         this.getFlowTaskForm(this.taskForm.taskId)
-        console.log(this.taskForm.formId);
         this.getAssessByAssessId(this.taskForm.formId)
       }
       this.getFlowRecordList(this.taskForm.procInsId, this.taskForm.deployId);
@@ -347,9 +346,10 @@ export default {
     },
     // 获取需要处理的表单表格信息
     getAssessByAssessId(formId) {
+      
       getAssess(formId).then(res => {
         let data = res.data;
-        debugger
+        
         for (let d in data) {
           if (d.includes('role')) {
             if (data[d] != "" && data[d] != undefined && data[d] != null)
@@ -370,7 +370,7 @@ export default {
       // this.completeOpen = true;
       // this.completeTitle = "流程审批";
       // this.submitForm(null);
-      debugger
+      
       let formData = new FormData();
       this.tableForm.formId = this.tableForm.assessId;
       let form = JSON.stringify(this.tableForm);
@@ -485,8 +485,8 @@ export default {
     },
     /** 申请流程表单数据提交 */
     submitForm(formData, assessId) {
-      debugger
       listAssess({ assessId }).then(result => {
+        
         let list = result;
         if (list.total != 0) {
           modifyAssess(formData).then(res => {

oa-ui/src/views/flowable/task/todo/index.vue

@@ -119,8 +119,6 @@ export default {
     // 跳转到处理页面
     handleProcess(row) {
       getProcessVariables(row.taskId).then(res => {
-        console.log(row);
-        console.log(res);
         this.$router.push({
           path: '/flowable/task/todo/detail/index',
           query: {

oa-ui/src/views/system/user/index.vue

@@ -513,7 +513,7 @@ export default {
         this.roleOptions = response.roles;
         this.$set(this.form, "postIds", response.postIds);
         this.$set(this.form, "roleIds", response.roleIds);
-        debugger
+        
         if (response.data.titles != "" && response.data.titles != undefined && response.data.titles != null) {
           for (let i = 0; i < response.data.titles.split(",").length; i++)
             this.titles[i] = response.data.titles.split(",")[i]