修改生产考核表里提交时的问题

oa-ui/src/assets/datas/SCContent.js

@@ -2,13 +2,13 @@
  * @Author: ysh
  * @Date: 2024-01-24 10:17:09
  * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-24 17:21:14
+ * @LastEditTime: 2024-01-25 11:25:25
  */
 export const SCContent = [
   {
     label: '项目负责',
     value: 'f01',
-    role:['常规项目','监测项目','调查项目','测量中心','其他项目'],
+    role:['常规项目03','监测项目04','调查项目05','测量中心06','其他项目07'],
     children: [
       {
         label: '项目负责',
@@ -40,6 +40,7 @@ export const SCContent = [
   {
     label: '精密测量项目（施控网、监测网）',
     value: 'f02',
+    role:['选点08','埋石09','观测10','计算11','检查12','负责13'],
     children: [
       {
         label: '施控网技术设计',
@@ -96,6 +97,7 @@ export const SCContent = [
   {
     label: '外业-【界桩测设】【配合测量】【导线、高程测量】',
     value: 'f03',
+    role:['观测10','计算11','前视14','后视15','水准16','三角高程17'],
     children: [
       {
         label: '【界桩测设】含钻孔、地质点等',
@@ -125,6 +127,7 @@ export const SCContent = [
   {
     label: '外业-GNSS测量',
     value: 'f04',
+    role:['观测10','计算11','选点08','埋石09'],
     children: [
       {
         label: '二',
@@ -148,6 +151,7 @@ export const SCContent = [
   {
     label: '外业-地形图测绘',
     value: 'f05',
+    role:['实测18','相控19','调绘20'],
     children: [
       {
         label: '1:200',
@@ -179,6 +183,7 @@ export const SCContent = [
   {
     label: '外业-断面测量',
     value: 'f06',
+    role:['测量21','整理22'],
     children: [
       {
         label: '1:200',
@@ -210,6 +215,7 @@ export const SCContent = [
   {
     label: '外业-航飞',
     value: 'f07',
+    role:['主飞23','协助24'],
     children: [
       {
         label: ['傲视', '飞马', '华测', '其他'],
@@ -219,26 +225,20 @@ export const SCContent = [
     ]
   },
   {
-    label: '内业-空三',
+    label: '内业-【空三】【坐标转换】',
     value: 'f08',
+    role:['作业25','检查26','负责27'],
     children: [
       {
-        label: '卫片',
+        label: '【空三】卫片',
         value: 'f0801',
         unit: '项'
       }, {
-        label: '航片',
+        label: '【空三】航片',
         value: 'f0802',
         unit: '项'
-      }
-    ]
-  },
-  {
-    label: '内业-坐标转换',
-    value: 'f08',
-    children: [
-      {
-        label: '坐标、地形图等',
+      },{
+        label: '【坐标转换】坐标、地形图等',
         value: 'f0803',
         unit: '项'
       }
@@ -246,6 +246,7 @@ export const SCContent = [
   }, {
     label: '内业-航测地形图',
     value: 'f09',
+    role:['作业25','检查26','负责27'],
     children: [
       {
         label: '1:200',
@@ -276,6 +277,7 @@ export const SCContent = [
   }, {
     label: '内业-激光制图',
     value: 'f10',
+    role:['作业25','检查26','负责27'],
     children: [
       {
         label: '1:500',
@@ -302,6 +304,7 @@ export const SCContent = [
   }, {
     label: '内业-编图',
     value: 'f11',
+    role:['作业25','检查26','负责27'],
     children: [
       {
         label: '1:200',
@@ -332,6 +335,7 @@ export const SCContent = [
   }, {
     label: '内业-点云分类',
     value: 'f12',
+    role:['作业25','检查26','负责27'],
     children: [
       {
         label: '1:500',
@@ -358,6 +362,7 @@ export const SCContent = [
   }, {
     label: '内业-三维地形面',
     value: 'f13',
+    role:['作业25','检查26','负责27'],
     children: [
       {
         label: '1:200',
@@ -388,6 +393,7 @@ export const SCContent = [
   }, {
     label: '内业-DOM',
     value: 'f14',
+    role:['作业25','检查26','负责27'],
     children: [
       {
         label: '1:200',
@@ -418,6 +424,7 @@ export const SCContent = [
   }, {
     label: '内业-DEM',
     value: 'f15',
+    role:['作业25','检查26','负责27'],
     children: [
       {
         label: '1:200',
@@ -449,6 +456,7 @@ export const SCContent = [
   {
     label: '内业-三维模型、电子沙盘制作',
     value: 'f16',
+    role:['空三28','建模29','修模30'],
     children: [
       {
         label: 'GSD ≤2.9cm',
@@ -472,6 +480,7 @@ export const SCContent = [
   {
     label: '内业-激光预处理',
     value: 'f17',
+    role:['作业25','检查26'],
     children: [
       {
         label: '1:200',

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

@@ -1,128 +0,0 @@
-<!--
- * @Author: ysh
- * @Date: 2024-01-19 16:29:01
- * @LastEditors: Please set LastEditors
- * @LastEditTime: 2024-01-24 17:34:14
--->
-<template>
-  <div>
-    <el-form ref="scform" :model="form">
-      <el-form-item label="选择考核项：">
-        <el-checkbox-group v-model="checkedBtn">
-          <el-checkbox v-for="sc, index in AssessmentContent" :label="sc.label" :key="index" :value="sc.value">{{ sc.label
-          }}</el-checkbox>
-        </el-checkbox-group>
-      </el-form-item>
-      <el-row type="flex" style="flex-wrap:wrap;">
-        <el-card v-for="item in checkedBtn" style="flex:1;margin:10px;min-width: 400px;max-width: 450px;">
-          <div slot="header" class="clearfix">
-            <strong>{{ item }}</strong>
-            <el-button style="float: right; padding: 3px 0" type="text" @click="closeItem(item)">关闭</el-button>
-          </div>
-          <el-scrollbar style="height: 500px;">
-            <div v-for="ass in AssessmentContent" v-if="ass.label == item">
-              <table border="1" cellspacing="0" align="center" cellpadding="5">
-                <tr style="background-color:#409EFF;color:#fff;">
-                  <td>等级、比例尺等</td>
-                  <td>工作量</td>
-                  <td>单位</td>
-                </tr>
-                <tr v-for="child in ass.children">
-                  <td v-if="!Array.isArray(child.label)">{{ child.label }}</td>
-                  <td v-else colspan="2">
-                    <el-checkbox-group v-model="form.f07">
-                      <el-checkbox v-for="label in child.label" :label="label"></el-checkbox>
-                    </el-checkbox-group>
-                  </td>
-                  <td v-if="!Array.isArray(child.label)">
-                    <el-input v-model="form[child.value]" style="width: 100%"></el-input>
-                  </td>
-                  <td>{{ child.unit }}</td>
-                </tr>
-                <tr>
-                  <td>熟练程度</td>
-                  <td colspan="2">
-                    <el-radio-group v-model="form['familiar' + ass.value.slice(-2)]">
-                      <el-radio :label="0">生疏</el-radio>
-                      <el-radio :label="2">熟练</el-radio>
-                    </el-radio-group>
-                  </td>
-                </tr>
-                <tr>
-                  <td>承担角色</td>
-                  <td colspan="2">
-                    <el-checkbox-group v-model="form['role' + ass.value.slice(-2)]">
-                      <el-checkbox v-for="role in ass.role" :label="role.substring(0,4)" :value="role.slice(-1)"></el-checkbox>
-                    </el-checkbox-group>
-                  </td>
-                </tr>
-                <tr>
-                  <td>备注</td>
-                  <td colspan="2">
-                    <el-input type="textarea" :rows="2" placeholder="请输入内容"
-                      v-model="form['remark' + ass.value.slice(-2)]">
-                    </el-input>
-                  </td>
-                </tr>
-              </table>
-            </div>
-          </el-scrollbar>
-
-        </el-card>
-      </el-row>
-      <el-row>
-        <el-button @click="submit" type="primary">提交</el-button>
-      </el-row>
-    </el-form>
-  </div>
-</template>
-
-<script>
-import { SCContent } from '@/assets/datas/SCContent'
-export default {
-  dicts: ['cmc_skill'],
-  data() {
-    return {
-      checkedBtn: [],
-      AssessmentContent: SCContent,
-      form: {
-        f07: []
-      }
-    }
-  },
-  created() {
-    this.initForm();
-  },
-  watch: {
-    checkedBtn: (newval, oldval) => {
-
-    }
-  },
-  mounted() {
-  },
-  methods: {
-    initForm() {
-      debugger
-      for (let i = 0; i < SCContent.length; i++) {
-        if (i.toString().length == 1) {
-          this.$set(this.form, 'role' + '0' + i, [])
-        } else {
-          this.$set(this.form, 'role' + i, [])
-        }
-
-      }
-    },
-    submit() {
-      console.log(this.form);
-    },
-    closeItem(item) {
-      let index = this.checkedBtn.indexOf(item);
-      if (index !== -1) {
-        this.checkedBtn.splice(index, 1);
-      }
-    }
-  },
-}
-</script>
-
-<style lang="scss" scoped></style>

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

@@ -0,0 +1,219 @@
+<!--
+ * @Author: ysh
+ * @Date: 2024-01-19 16:29:01
+ * @LastEditors: Please set LastEditors
+ * @LastEditTime: 2024-01-25 15:27:39
+-->
+<template>
+  <div>
+    <el-form ref="scform" :model="form">
+      <el-form-item label="选择项目：">
+        <el-select v-model="form.projectId" placeholder="请选择项目">
+          <el-option v-for="item in projectList" :key="item.value" :label="item.label" :value="item.value">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="选择考核项：">
+        <el-checkbox-group v-model="checkedBtn" @change="assessChangeFn">
+          <el-checkbox v-for="sc, index in AssessmentContent" :label="sc.label" :key="index" :value="sc.value">{{ sc.label
+          }}</el-checkbox>
+        </el-checkbox-group>
+      </el-form-item>
+      <div class="tips" v-if="tipsShow">请至少选择一项考核项</div>
+      <el-row type="flex" style="flex-wrap:wrap;">
+        <el-card v-for="item in checkedBtn" style="flex:1;margin:10px;min-width: 400px;max-width: 450px;">
+          <div slot="header" class="clearfix">
+            <strong>{{ item }}</strong>
+            <el-button style="float: right; padding: 3px 0" type="text" @click="closeItem(item)">关闭</el-button>
+          </div>
+          <el-scrollbar style="height: 500px;">
+            <div v-for="ass in AssessmentContent" v-if="ass.label == item">
+              <table border="1" cellspacing="0" align="center" cellpadding="5">
+                <tr style="background-color:#409EFF;color:#fff;">
+                  <td>等级、比例尺等</td>
+                  <td>工作量</td>
+                  <td>单位</td>
+                </tr>
+                <tr v-for="child in ass.children">
+                  <td v-if="!Array.isArray(child.label)">{{ child.label }}</td>
+                  <td v-else>
+                    <el-checkbox-group v-model="form.f07">
+                      <el-checkbox v-for="label in child.label" :label="label"></el-checkbox>
+                    </el-checkbox-group>
+                  </td>
+                  <td v-if="Array.isArray(child.label)">
+                    <el-input v-model="form[child.value]" style="width: 100%"></el-input>
+                  </td>
+                  <td v-if="!Array.isArray(child.label)">
+                    <el-input v-model="form[child.value]" style="width: 100%"></el-input>
+                  </td>
+                  <td>{{ child.unit }}</td>
+                </tr>
+                <tr>
+                  <td>熟练程度</td>
+                  <td colspan="2">
+                    <el-radio-group v-model="form['familiar' + ass.value.slice(-2)]">
+                      <el-radio :label="0">生疏</el-radio>
+                      <el-radio :label="2">熟练</el-radio>
+                    </el-radio-group>
+                  </td>
+                </tr>
+                <tr>
+                  <td>承担角色</td>
+                  <td colspan="2">
+                    <el-checkbox-group v-model="form['role' + ass.value.slice(-2)]">
+                      <el-checkbox v-for="role in ass.role" :label="role.slice(-2)">{{ getRoleLabel(role) }}</el-checkbox>
+                    </el-checkbox-group>
+                  </td>
+                </tr>
+                <tr>
+                  <td>备注</td>
+                  <td colspan="2">
+                    <el-input type="textarea" :rows="2" placeholder="请输入内容"
+                      v-model="form['remark' + ass.value.slice(-2)]">
+                    </el-input>
+                  </td>
+                </tr>
+              </table>
+              <div class="tips" v-if="inputTips">工作量只能输入数字</div>
+            </div>
+          </el-scrollbar>
+        </el-card>
+      </el-row>
+      <el-row>
+        <el-button @click="generateForm" type="primary">生成考核表</el-button>
+      </el-row>
+    </el-form>
+    <el-dialog title="考核表" :visible.sync="taskOpen" width="65%" append-to-body>
+      <ScTable :tableForm="noNullForm"></ScTable>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { SCContent } from '@/assets/datas/SCContent'
+import { MessageBox } from 'element-ui'
+import ScTable from './scTable.vue';
+export default {
+  dicts: ['cmc_skill'],
+  components: { ScTable },
+  data() {
+    return {
+      checkedBtn: [],
+      AssessmentContent: SCContent,
+      projectList: [],
+      form: {
+        f07: []
+      },
+      noNullForm: {},
+      taskOpen: false,
+      tipsShow: false,
+      inputTips: false
+    };
+  },
+  created() {
+    this.initForm();
+  },
+  watch: {},
+  mounted() {
+  },
+  methods: {
+    initForm() {
+      for (let i = 0; i < SCContent.length; i++) {
+        if (i.toString().length == 1) {
+          this.$set(this.form, 'role' + '0' + i, []);
+        }
+        else {
+          this.$set(this.form, 'role' + i, []);
+        }
+      }
+    },
+    // 提交表单
+    submit() {
+      MessageBox.confirm('是否确认提交？', '任务提交', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning' }).then(() => {
+
+        // this.$emit('submit', noNullForm);
+      }).catch(() => {
+      });
+    },
+    // 生成考核表格
+    generateForm() {
+      if (this.checkedBtn.length == 0) {
+        this.tipsShow = true;
+        return
+      }
+      this.taskOpen = true;
+      for (let f in this.form) {
+        if (this.form[f] != "" && this.form[f] != [] && this.form[f] != undefined) {
+          this.$set(this.noNullForm, f, this.form[f])
+        }
+      }
+      console.log(this.noNullForm);
+    },
+    closeItem(item) {
+      debugger;
+      let index = this.checkedBtn.indexOf(item);
+      let number;
+      if (index !== -1) {
+        this.checkedBtn.splice(index, 1);
+      }
+      for (let i of SCContent) {
+        if (i.label == item) {
+          number = i.value;
+        }
+      }
+      for (let fkey in this.form) {
+        if (fkey.substring(0, 3) == number) {
+          if (typeof (this.form[fkey]) == 'string') {
+            this.form[fkey] = "";
+          }
+          else if (Array.isArray(this.form[fkey])) {
+            this.form[fkey] = [];
+          }
+        }
+        this.form['role' + number.substring(1, 3)] = [];
+        this.form['familiar' + number.substring(1, 3)] = undefined;
+        this.form['remark' + number.substring(1, 3)] = "";
+      }
+    },
+    assessChangeFn(val) {
+      if (val.length != 0) {
+        this.tipsShow = false;
+      }
+    },
+    getRoleLabel(role) {
+      let len = role.length;
+      return role.substring(0, len - 2);
+    },
+    mustNumber(val, event) {
+      console.log(event);
+      let regex = /^\d+(\.\d{1,2})?$/;
+      let newElement = document.createElement("div");
+      newElement.innerHTML = '工作量必须是数字';
+      newElement.classList.add('inputTips');
+      if (regex.test(val) || val == "") {
+        this.inputTips = false;
+      } else {
+        this.inputTips = true;
+        event.target.parentNode.appendChild(newElement, event.target)
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.tips {
+  color: #f00;
+  font-size: 12px;
+  line-height: 18px;
+}
+</style>
+<style>
+.inputTips {
+  color: #f00;
+  font-size: 12px;
+  line-height: 18px;
+  display: block;
+}
+</style>

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

@@ -0,0 +1,31 @@
+<template>
+  <div>
+    {{ tableForm }}
+  </div>
+</template>
+
+<script>
+import { SCContent } from '@/assets/datas/SCContent'
+export default {
+  dict: ['cmc_role', 'cmc_skill'],
+  props: {
+    tableForm: {
+      type: Object,
+      required: true
+    },
+  },
+  watch: {
+
+  },
+  data() {
+    return {
+      form: {}
+    }
+  },
+  mounted() {
+
+  },
+}
+</script>
+
+<style lang="scss" scoped></style>

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

@@ -129,7 +129,7 @@
 
     <!-- 自定义表单 -->
     <el-dialog :title="formTitle" :visible.sync="moreFormOpen" width="60%" append-to-body>
-      <Cmc></Cmc>
+      <scform></scform>
     </el-dialog>
   </div>
 </template>
@@ -138,13 +138,13 @@
 import { listForm, getForm, delForm, addForm, updateForm, exportForm } from "@/api/flowable/form";
 import Editor from '@/components/Editor';
 import Parser from '@/components/parser/Parser'
-import Cmc from '../../form/cmc.vue'
+import scform from '../../form/scForm.vue'
 export default {
   name: "Form",
   components: {
     Editor,
     Parser,
-    Cmc
+    scform
   },
   data() {
     return {

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

@@ -7,12 +7,15 @@
       </div>
       <el-tabs  tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
-        <el-tab-pane label="表单信息" name="1">
+        <!-- <el-tab-pane label="表单信息" name="1">
           <el-col :span="16" :offset="4">
             <div class="test-form">
                 <parser :key="new Date().getTime()" :form-conf="variablesData" />
             </div>
          </el-col>
+        </el-tab-pane> -->
+        <el-tab-pane label="表单信息" name="1">
+          <ScTable></ScTable>
         </el-tab-pane>
         <!--流程流转记录-->
         <el-tab-pane label="流转记录" name="2">
@@ -75,13 +78,15 @@ import Parser from '@/components/parser/Parser'
 import {getProcessVariables, readXml, getFlowViewer, getHighlight, flowXmlAndNode} from "@/api/flowable/definition";
 import flow from '@/views/flowable/task/myProcess/detail/flow'
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import ScTable from "../../../form/scTable.vue";
 
 export default {
   name: "Record",
   components: {
     Parser,
-    flow
-  },
+    flow,
+    ScTable
+},
   props: {},
   data() {
     return {

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

@@ -7,24 +7,24 @@
       </div>
       <el-tabs tab-position="top" v-model="activeName" @tab-click="handleClick">
         <!--表单信息-->
-        <el-tab-pane label="表单信息" name="1">
-          <!--初始化流程加载表单信息-->
+        <!-- <el-tab-pane label="表单信息" name="1">
+          初始化流程加载表单信息
           <el-col :span="16" :offset="4">
             <div class="test-form">
               <parser :key="new Date().getTime()" :form-conf="formConf" @submit="submitForm" ref="parser"
                 @getData="getData" />
             </div>
           </el-col>
-        </el-tab-pane>
-        <el-tab-pane label="表单信息" name="4">
-            <Cmc></Cmc>
+        </el-tab-pane> -->
+        <el-tab-pane label="表单信息" name="1">
+            <scform @submit="submits"></scform>
         </el-tab-pane>
         <!--流程图-->
         <el-tab-pane label="流程图" name="2">
           <flow :flowData="flowData" />
         </el-tab-pane>
       </el-tabs>
-      <el-button @click="submits">提交</el-button>
+      <!-- <el-button @click="submits">提交</el-button> -->
       <!--选择流程接收人-->
       <el-dialog :title="taskTitle" :visible.sync="taskOpen" width="65%" append-to-body>
         <flow-user v-if="checkSendUser" :checkType="checkType" @handleUserSelect="handleUserSelect" />
@@ -46,7 +46,7 @@ import { flowFormData } from "@/api/flowable/process";
 import { getNextFlowNodeByStart } from "@/api/flowable/todo";
 import FlowUser from '@/components/flow/User'
 import FlowRole from '@/components/flow/Role'
-import Cmc from '../../../form/cmc.vue';
+import scform from '../../../form/scForm.vue';
 
 export default {
   name: "Record",
@@ -55,7 +55,7 @@ export default {
     flow,
     FlowUser,
     FlowRole,
-    Cmc
+    scform
 },
   props: {},
   data() {
@@ -95,7 +95,8 @@ export default {
     this.getFlowFormData(this.deployId);
   },
   methods: {
-    submits() {
+    submits(form) {
+      console.log(form);
       getNextFlowNodeByStart({ deploymentId: this.deployId, variables: {} }).then(res => {
         console.log(res);
         debugger