Browse Source

修改生成生产考核表

余思翰 1 year ago
parent
commit
3e5dfd1de6

+ 17
- 2
oa-ui/src/assets/datas/SCContent.js View File

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-01-24 10:17:09
3
  * @Date: 2024-01-24 10:17:09
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-01-25 11:25:25
5
+ * @LastEditTime: 2024-01-25 16:48:56
6
  */
6
  */
7
 export const SCContent = [
7
 export const SCContent = [
8
   {
8
   {
218
     role:['主飞23','协助24'],
218
     role:['主飞23','协助24'],
219
     children: [
219
     children: [
220
       {
220
       {
221
-        label: ['傲视', '飞马', '华测', '其他'],
221
+        label: '傲视',
222
         value: 'f0701',
222
         value: 'f0701',
223
         unit: '人天'
223
         unit: '人天'
224
+      },
225
+      {
226
+        label:'飞马',
227
+        value: 'f0702',
228
+        unit: '人天',
229
+      },
230
+      {
231
+        label:'华测',
232
+        value: 'f0703',
233
+        unit: '人天',
234
+      },
235
+      {
236
+        label:'其他',
237
+        value: 'f0704',
238
+        unit: '人天',
224
       }
239
       }
225
     ]
240
     ]
226
   },
241
   },

+ 4
- 6
oa-ui/src/views/flowable/form/scForm.vue View File

2
  * @Author: ysh
2
  * @Author: ysh
3
  * @Date: 2024-01-19 16:29:01
3
  * @Date: 2024-01-19 16:29:01
4
  * @LastEditors: Please set LastEditors
4
  * @LastEditors: Please set LastEditors
5
- * @LastEditTime: 2024-01-25 15:27:39
5
+ * @LastEditTime: 2024-01-25 16:49:50
6
 -->
6
 -->
7
 <template>
7
 <template>
8
   <div>
8
   <div>
84
         <el-button @click="generateForm" type="primary">生成考核表</el-button>
84
         <el-button @click="generateForm" type="primary">生成考核表</el-button>
85
       </el-row>
85
       </el-row>
86
     </el-form>
86
     </el-form>
87
-    <el-dialog title="考核表" :visible.sync="taskOpen" width="65%" append-to-body>
87
+    <el-dialog title="" :visible.sync="taskOpen" width="65%" append-to-body>
88
       <ScTable :tableForm="noNullForm"></ScTable>
88
       <ScTable :tableForm="noNullForm"></ScTable>
89
     </el-dialog>
89
     </el-dialog>
90
   </div>
90
   </div>
102
       checkedBtn: [],
102
       checkedBtn: [],
103
       AssessmentContent: SCContent,
103
       AssessmentContent: SCContent,
104
       projectList: [],
104
       projectList: [],
105
-      form: {
106
-        f07: []
107
-      },
105
+      form: {},
108
       noNullForm: {},
106
       noNullForm: {},
109
       taskOpen: false,
107
       taskOpen: false,
110
       tipsShow: false,
108
       tipsShow: false,
143
         return
141
         return
144
       }
142
       }
145
       this.taskOpen = true;
143
       this.taskOpen = true;
144
+      console.log(this.form);
146
       for (let f in this.form) {
145
       for (let f in this.form) {
147
         if (this.form[f] != "" && this.form[f] != [] && this.form[f] != undefined) {
146
         if (this.form[f] != "" && this.form[f] != [] && this.form[f] != undefined) {
148
           this.$set(this.noNullForm, f, this.form[f])
147
           this.$set(this.noNullForm, f, this.form[f])
151
       console.log(this.noNullForm);
150
       console.log(this.noNullForm);
152
     },
151
     },
153
     closeItem(item) {
152
     closeItem(item) {
154
-      debugger;
155
       let index = this.checkedBtn.indexOf(item);
153
       let index = this.checkedBtn.indexOf(item);
156
       let number;
154
       let number;
157
       if (index !== -1) {
155
       if (index !== -1) {

+ 1106
- 5
oa-ui/src/views/flowable/form/scTable.vue
File diff suppressed because it is too large
View File


Loading…
Cancel
Save