Procházet zdrojové kódy

检验和总检无需附件

chrislee před 4 měsíci
rodič
revize
833c6b19b7

+ 99 - 299
src/components/work-flow/node-add.vue

@@ -1,250 +1,109 @@
 <template>
   <div>
-    <el-form
-      :model="form"
-      ref="form"
-      :rules="rules"
-      label-width="80px"
-      v-if="node.type !== 't-check'"
-    >
+    <el-form :model="form" ref="form" :rules="rules" label-width="80px" v-if="node.type !== 't-check'">
       <el-form-item label="节点名称" prop="nodeName">
-        <el-input
-          v-model="form.nodeName"
-          placeholder="请输入节点名称"
-          :disabled="disabled || selectOperator"
-        ></el-input>
+        <el-input v-model="form.nodeName" placeholder="请输入节点名称" :disabled="disabled || selectOperator"></el-input>
       </el-form-item>
-      <el-form-item
-        label="工种类型"
-        prop="workTypeId"
-        v-if="node.type !== 'end'"
-      >
-        <el-select
-          v-model="form.workTypeId"
-          placeholder="请选择"
-          style="width: 100%"
-          :disabled="disabled || selectOperator"
-          @change="onChage"
-        >
-          <el-option
-            v-for="item in workTypeOptions"
-            :key="item.typeId"
-            :label="item.name"
-            :value="item.typeId"
-          ></el-option>
+      <el-form-item label="工种类型" prop="workTypeId" v-if="node.type !== 'end'">
+        <el-select v-model="form.workTypeId" placeholder="请选择" style="width: 100%"
+          :disabled="disabled || selectOperator" @change="onChage">
+          <el-option v-for="item in workTypeOptions" :key="item.typeId" :label="item.name"
+            :value="item.typeId"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="工时单价">
-        <el-input
-          v-model="form.quotedPrice"
-          placeholder="工时单价"
-          :disabled="disabled"
-        ></el-input>
+        <el-input v-model="form.quotedPrice" placeholder="工时单价" :disabled="disabled"></el-input>
       </el-form-item>
       <el-form-item label="备注" prop="notes">
-        <el-input
-          v-model="form.notes"
-          :disabled="disabled || selectOperator"
-        ></el-input>
+        <el-input v-model="form.notes" :disabled="disabled || selectOperator"></el-input>
       </el-form-item>
       <el-form-item label="工序要求" prop="require" v-if="node.type !== 'end'">
-        <el-input
-          v-model="form.require"
-          :disabled="disabled || selectOperator"
-        ></el-input>
+        <el-input v-model="form.require" :disabled="disabled || selectOperator"></el-input>
       </el-form-item>
       <el-form-item label="工序说明" prop="explain" v-if="node.type !== 'end'">
-        <el-input
-          v-model="form.explain"
-          :disabled="disabled || selectOperator"
-        ></el-input>
+        <el-input v-model="form.explain" :disabled="disabled || selectOperator"></el-input>
       </el-form-item>
       <el-form-item label="工序特性" prop="process" v-if="node.type !== 'end'">
-        <el-input
-          v-model="form.process"
-          :disabled="disabled || selectOperator"
-        ></el-input>
+        <el-input v-model="form.process" :disabled="disabled || selectOperator"></el-input>
       </el-form-item>
-      <el-form-item
-        label="所需工时"
-        prop="preTaskTime"
-        v-if="node.type !== 'end'"
-      >
-        <el-input
-          v-model="form.preTaskTime"
-          :disabled="disabled || selectOperator"
-          oninput="value=value.replace(/[^0-9.]/g,'')"
-        >
+      <el-form-item label="所需工时" prop="preTaskTime" v-if="node.type !== 'end'">
+        <el-input v-model="form.preTaskTime" :disabled="disabled || selectOperator"
+          oninput="value=value.replace(/[^0-9.]/g,'')">
           <i slot="suffix" style="font-style: normal; margin-right: 10px">h</i>
         </el-input>
       </el-form-item>
       <el-form-item label="操作人" v-if="form.operatorName && !selectOperator">
-        <el-input
-          :disabled="disabled && selectOperator"
-          v-model="form.operatorName"
-        ></el-input>
+        <el-input :disabled="disabled && selectOperator" v-model="form.operatorName"></el-input>
       </el-form-item>
-      <el-form-item
-        label="操作人"
-        prop="operatorId"
-        v-if="selectOperator && node.type !== 'end'"
-      >
-        <el-select
-          v-model="form.operatorId"
-          :disabled="disabled && selectOperator"
-          multiple
-          placeholder="请选择"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in operatorIdOptions"
-            :key="item.userId"
-            :label="item.name"
-            :value="item.userId"
-          ></el-option>
+      <el-form-item label="操作人" prop="operatorId" v-if="selectOperator && node.type !== 'end'">
+        <el-select v-model="form.operatorId" :disabled="disabled && selectOperator" multiple placeholder="请选择"
+          style="width: 100%">
+          <el-option v-for="item in operatorIdOptions" :key="item.userId" :label="item.name"
+            :value="item.userId"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item v-if="node.type !== 'end' && !disabled && !selectOperator">
-        <upload-component
-          :title="'附件'"
-          :accept="'*'"
-          :file-obj-list="fileList"
-          @uploadSuccess="uploadSuccess"
-        />
+        <upload-component :title="'附件'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess" />
       </el-form-item>
       <el-form-item v-else>
-        <upload-component
-          :display="true"
-          :title="'附件'"
-          :accept="'*'"
-          :file-obj-list="fileList"
-          @uploadSuccess="uploadSuccess"
-        />
+        <upload-component :display="true" :title="'附件'" :accept="'*'" :file-obj-list="fileList"
+          @uploadSuccess="uploadSuccess" />
       </el-form-item>
     </el-form>
 
     <!-- 节点是总检时显示下面内容 -->
-    <el-form
-      :model="form"
-      ref="form"
-      :rules="rules"
-      label-width="80px"
-      v-if="node.type == 't-check'"
-    >
+    <el-form :model="form" ref="form" :rules="rules" label-width="80px" v-if="node.type == 't-check'">
       <el-row>
         <el-col :span="8">
           <el-form-item label="节点名称" prop="nodeName">
-            <el-input
-              v-model="form.nodeName"
-              placeholder="请输入节点名称"
-              :disabled="disabled || selectOperator"
-            ></el-input>
+            <el-input v-model="form.nodeName" placeholder="请输入节点名称" :disabled="disabled || selectOperator"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="工种类型"
-            prop="workTypeId"
-            v-if="node.type !== 'end'"
-          >
-            <el-select
-              v-model="form.workTypeId"
-              placeholder="请选择"
-              style="width: 100%"
-              :disabled="disabled || selectOperator"
-              @change="onChage"
-            >
-              <el-option
-                v-for="item in workTypeOptions"
-                :key="item.typeId"
-                :label="item.name"
-                :value="item.typeId"
-              ></el-option>
+          <el-form-item label="工种类型" prop="workTypeId" v-if="node.type !== 'end'">
+            <el-select v-model="form.workTypeId" placeholder="请选择" style="width: 100%"
+              :disabled="disabled || selectOperator" @change="onChage">
+              <el-option v-for="item in workTypeOptions" :key="item.typeId" :label="item.name"
+                :value="item.typeId"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="8">
           <el-form-item label="工时单价">
-            <el-input
-              v-model="form.quotedPrice"
-              placeholder="工时单价"
-              disabled
-            ></el-input>
+            <el-input v-model="form.quotedPrice" placeholder="工时单价" disabled></el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item
-            label="工序要求"
-            prop="require"
-            v-if="node.type !== 'end'"
-          >
-            <el-input
-              v-model="form.require"
-              :disabled="disabled || selectOperator"
-            ></el-input>
+          <el-form-item label="工序要求" prop="require" v-if="node.type !== 'end'">
+            <el-input v-model="form.require" :disabled="disabled || selectOperator"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="工序说明"
-            prop="explain"
-            v-if="node.type !== 'end'"
-          >
-            <el-input
-              v-model="form.explain"
-              :disabled="disabled || selectOperator"
-            ></el-input>
+          <el-form-item label="工序说明" prop="explain" v-if="node.type !== 'end'">
+            <el-input v-model="form.explain" :disabled="disabled || selectOperator"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="所需工时"
-            prop="preTaskTime"
-            v-if="node.type !== 'end'"
-          >
-            <el-input
-              v-model="form.preTaskTime"
-              :disabled="disabled || selectOperator"
-              oninput="value=value.replace(/[^0-9.]/g,'')"
-            >
-              <i slot="suffix" style="font-style: normal; margin-right: 10px"
-                >h</i
-              >
+          <el-form-item label="所需工时" prop="preTaskTime" v-if="node.type !== 'end'">
+            <el-input v-model="form.preTaskTime" :disabled="disabled || selectOperator"
+              oninput="value=value.replace(/[^0-9.]/g,'')">
+              <i slot="suffix" style="font-style: normal; margin-right: 10px">h</i>
             </el-input>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-form-item
-            label="操作人"
-            v-if="disabled"
-          >
-            <el-input
-              :disabled="disabled"
-              v-model="form.operatorName"
-            ></el-input>
+          <el-form-item label="操作人" v-if="disabled">
+            <el-input :disabled="disabled" v-model="form.operatorName"></el-input>
           </el-form-item>
-          <el-form-item
-            label="操作人"
-            prop="operatorId"
-            v-if="!disabled && selectOperator && node.type !== 'end'"
-          >
-            <el-select
-              v-model="form.operatorId"
-              :disabled="disabled && selectOperator"
-              multiple
-              placeholder="请选择"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in operatorIdOptions"
-                :key="item.userId"
-                :label="item.name"
-                :value="item.userId"
-              ></el-option>
+          <el-form-item label="操作人" prop="operatorId" v-if="!disabled && selectOperator && node.type !== 'end'">
+            <el-select v-model="form.operatorId" :disabled="disabled && selectOperator" multiple placeholder="请选择"
+              style="width: 100%">
+              <el-option v-for="item in operatorIdOptions" :key="item.userId" :label="item.name"
+                :value="item.userId"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -252,11 +111,7 @@
       <el-row>
         <el-col :span="24">
           <el-form-item label="备注" prop="notes">
-            <el-input
-              type="textarea"
-              v-model="form.notes"
-              :disabled="disabled || selectOperator"
-            ></el-input>
+            <el-input type="textarea" v-model="form.notes" :disabled="disabled || selectOperator"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -278,126 +133,71 @@
         <el-table :data="form.prodProductionRequireList" style="width: 100%">
           <el-table-column prop="pageNo" label="页次/图区">
             <template slot-scope="scope">
-              <el-form-item
-                :prop="'prodProductionRequireList.' + scope.$index + '.pageNo'"
-                :rules="rules.pageNo"
-                label-width="0px"
-              >
-                <el-input
-                  v-model="scope.row.pageNo"
-                  :disabled="disabled || selectOperator"
-                ></el-input>
+              <el-form-item :prop="'prodProductionRequireList.' + scope.$index + '.pageNo'" :rules="rules.pageNo"
+                label-width="0px">
+                <el-input v-model="scope.row.pageNo" :disabled="disabled || selectOperator"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="inspectionParam" label="检查参数">
             <template slot-scope="scope">
-              <el-form-item
-                :prop="
-                  'prodProductionRequireList.' +
-                  scope.$index +
-                  '.inspectionParam'
-                "
-                :rules="rules.inspectionParam"
-                label-width="0px"
-              >
-                <el-input
-                  v-model="scope.row.inspectionParam"
-                  :disabled="disabled || selectOperator"
-                  @blur="inspectionParamBlur($event, scope.$index)"
-                ></el-input>
+              <el-form-item :prop="'prodProductionRequireList.' +
+                scope.$index +
+                '.inspectionParam'
+                " :rules="rules.inspectionParam" label-width="0px">
+                <el-input v-model="scope.row.inspectionParam" :disabled="disabled || selectOperator"
+                  @blur="inspectionParamBlur($event, scope.$index)"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="inspectionMethod" label="检验方法">
             <template slot-scope="scope">
-              <el-form-item
-                :prop="
-                  'prodProductionRequireList.' +
-                  scope.$index +
-                  '.inspectionMethod'
-                "
-                :rules="rules.inspectionMethod"
-                label-width="0px"
-              >
-                <el-select
-                  v-model="scope.row.inspectionMethod"
-                  placeholder="请选择"
-                  style="width: 100%"
-                  :disabled="disabled || selectOperator"
-                >
-                  <el-option
-                    v-for="item in inspectionMethodOptions"
-                    :key="item.value"
-                    :label="item.name"
-                    :value="item.value"
-                  ></el-option>
+              <el-form-item :prop="'prodProductionRequireList.' +
+                scope.$index +
+                '.inspectionMethod'
+                " :rules="rules.inspectionMethod" label-width="0px">
+                <el-select v-model="scope.row.inspectionMethod" placeholder="请选择" style="width: 100%"
+                  :disabled="disabled || selectOperator">
+                  <el-option v-for="item in inspectionMethodOptions" :key="item.value" :label="item.name"
+                    :value="item.value"></el-option>
                 </el-select>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="allowValues" label="允许值">
             <template slot-scope="scope">
-              <el-form-item
-                :prop="
-                  'prodProductionRequireList.' + scope.$index + '.allowValues'
-                "
-                :rules="rules.allowValues"
-                label-width="0px"
-              >
-                <el-input
-                  v-model="scope.row.allowValues"
-                  :disabled="disabled || selectOperator"
-                ></el-input>
+              <el-form-item :prop="'prodProductionRequireList.' + scope.$index + '.allowValues'
+                " :rules="rules.allowValues" label-width="0px">
+                <el-input v-model="scope.row.allowValues" :disabled="disabled || selectOperator"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="measureRecord1" label="实测记录1">
             <template slot-scope="scope">
-              <div style="margin-bottom:22px;">{{scope.row.measureRecord1}}</div>
+              <div style="margin-bottom:22px;">{{ scope.row.measureRecord1 }}</div>
             </template>
           </el-table-column>
           <el-table-column prop="measureRecord2" label="实测纪录2">
             <template slot-scope="scope">
-              <div style="margin-bottom:22px;">{{scope.row.measureRecord2}}</div>
+              <div style="margin-bottom:22px;">{{ scope.row.measureRecord2 }}</div>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="140px" v-if="!disabled">
             <template slot-scope="scope">
-              <el-button
-                type="primary"
-                icon="el-icon-circle-plus"
-                circle
-                @click="addRow"
-              ></el-button>
-              <el-button
-                type="danger"
-                icon="el-icon-delete"
-                circle
-                @click="removeRow(scope.$index)"
-                v-if="scope.$index > 0"
-              ></el-button>
+              <el-button type="primary" icon="el-icon-circle-plus" circle @click="addRow"></el-button>
+              <el-button type="danger" icon="el-icon-delete" circle @click="removeRow(scope.$index)"
+                v-if="scope.$index > 0"></el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-row>
-          <el-form-item v-if="!disabled && !selectOperator">
-            <upload-component
-              :title="'附件'"
-              :accept="'*'"
-              :file-obj-list="fileList"
-              @uploadSuccess="uploadSuccess"
-            />
-          </el-form-item>
-          <el-form-item v-else>
-            <upload-component
-              :display="true"
-              :title="'附件'"
-              :accept="'*'"
-              :file-obj-list="fileList"
-              @uploadSuccess="uploadSuccess"
-            />
-          </el-form-item>
+      <el-form-item v-if="!disabled && !selectOperator">
+        <upload-component :title="'附件'" :accept="'*'" :file-obj-list="fileList" @uploadSuccess="uploadSuccess" />
+      </el-form-item>
+      <el-form-item v-else>
+        <upload-component :display="true" :title="'附件'" :accept="'*'" :file-obj-list="fileList"
+          @uploadSuccess="uploadSuccess" />
+      </el-form-item>
     </el-form>
   </div>
 </template>
@@ -412,7 +212,7 @@ export default {
   props: {
     data: {
       type: Object,
-      default: () => {}
+      default: () => { }
     },
     disabled: {
       type: Boolean,
@@ -428,7 +228,7 @@ export default {
       default: false
     }
   },
-  data () {
+  data() {
     return {
       // 工种列表
       workTypeOptions: [],
@@ -439,7 +239,7 @@ export default {
         nodeName: '',
         workTypeId: '',
         operatorId: [],
-        prodProductionRequireList: [{allowValues: ''}]
+        prodProductionRequireList: [{ allowValues: '' }]
       },
       fileList: [],
       inspectionMethodOptions: [
@@ -486,7 +286,7 @@ export default {
     }
   },
   watch: {
-    data (val) {
+    data(val) {
       this.node = val
       this.form = {
         ...this.form,
@@ -510,19 +310,19 @@ export default {
         })
       }
     },
-    disabled (val) {
+    disabled(val) {
       this.disabled = val
     },
-    isEdit (val) {
+    isEdit(val) {
       this.isEdit = val
     }
   },
-  activated () {},
-  created () {
+  activated() { },
+  created() {
     this.getWorkTypeOptions()
   },
   computed: {},
-  mounted () {
+  mounted() {
     this.node = this.data
     this.form = {
       ...this.form,
@@ -546,7 +346,7 @@ export default {
     this.getOperatorList()
   },
   methods: {
-    getWorkTypeOptions () {
+    getWorkTypeOptions() {
       this.workTypeOptions = []
       getWorkType().then(({ data }) => {
         if (data && data.code === '200') {
@@ -554,7 +354,7 @@ export default {
         }
       })
     },
-    onChage (val) {
+    onChage(val) {
       this.workTypeOptions.forEach((v) => {
         if (v.typeId === val) {
           this.form.quotedPrice = Number(v.quotedPrice || 0).toFixed(2)
@@ -562,7 +362,7 @@ export default {
       })
     },
     // 按工种ID查询操作人列表
-    getOperatorList () {
+    getOperatorList() {
       if (this.node.workTypeId) {
         workTypeMasterList(this.node.workTypeId).then(({ data }) => {
           if (data && data.code === '200') {
@@ -574,11 +374,11 @@ export default {
         })
       }
     },
-    uploadSuccess (fileList) {
+    uploadSuccess(fileList) {
       this.fileList = fileList
     },
     // 校验表单
-    validateFormData () {
+    validateFormData() {
       return new Promise((resolve, reject) => {
         this.$refs['form'].validate((valid) => {
           if (!valid) {
@@ -591,7 +391,7 @@ export default {
       })
     },
     // 获取表单数据
-    formData () {
+    formData() {
       const form = { ...this.form, operatorName: '' }
       if (this.form.operatorId != null) {
         form.operatorId = this.form.operatorId.toString()
@@ -617,13 +417,13 @@ export default {
       return form
     },
 
-    addRow () {
-      this.form.prodProductionRequireList.push({allowValues: ''})
+    addRow() {
+      this.form.prodProductionRequireList.push({ allowValues: '' })
     },
-    removeRow (index) {
+    removeRow(index) {
       this.form.prodProductionRequireList.splice(index, 1)
     },
-    inspectionParamBlur (event, index) {
+    inspectionParamBlur(event, index) {
       console.log(event)
       console.log(event.target.value)
       this.$http({

+ 35 - 83
src/components/work-flow/node-edit-check.vue

@@ -1,87 +1,39 @@
 <template>
   <div>
-    <el-form
-      :model="form"
-      ref="form"
-      :rules="rules"
-      label-width="100px"
-    >
+    <el-form :model="form" ref="form" :rules="rules" label-width="100px">
       <el-form-item label="工时单价">
-        <el-input
-          v-model="form.quotedPrice"
-          placeholder="工时单价"
-          :disabled="disabled"
-        ></el-input>
+        <el-input v-model="form.quotedPrice" placeholder="工时单价" :disabled="disabled"></el-input>
       </el-form-item>
       <el-form-item label="备注" prop="notes">
-        <el-input
-          v-model="form.notes"
-          :disabled="disabled || selectOperator"
-        ></el-input>
+        <el-input v-model="form.notes" :disabled="disabled || selectOperator"></el-input>
       </el-form-item>
       <el-form-item label="工序要求" prop="require" v-if="node.type !== 'end'">
-        <el-input
-          v-model="form.require"
-          :disabled="disabled || selectOperator"
-        ></el-input>
+        <el-input v-model="form.require" :disabled="disabled || selectOperator"></el-input>
       </el-form-item>
       <el-form-item label="工序特性" prop="process" v-if="node.type !== 'end'">
-        <el-input
-          v-model="form.process"
-          :disabled="disabled || selectOperator"
-        ></el-input>
+        <el-input v-model="form.process" :disabled="disabled || selectOperator"></el-input>
       </el-form-item>
-      <el-form-item
-        label="所需工时"
-        prop="preTaskTime"
-      >
-        <el-input
-          v-model="form.preTaskTime"
-          :disabled="disabled || selectOperator"
-          oninput="value=value.replace(/[^0-9.]/g,'')"
-        >
+      <el-form-item label="所需工时" prop="preTaskTime">
+        <el-input v-model="form.preTaskTime" :disabled="disabled || selectOperator"
+          oninput="value=value.replace(/[^0-9.]/g,'')">
           <i slot="suffix" style="font-style: normal; margin-right: 10px">h</i>
         </el-input>
       </el-form-item>
       <el-form-item label="操作人" v-if="form.operatorName && !selectOperator">
-        <el-input
-          :disabled="disabled && selectOperator || !isEdit"
-          v-model="form.operatorName"
-        ></el-input>
+        <el-input :disabled="disabled && selectOperator || !isEdit" v-model="form.operatorName"></el-input>
       </el-form-item>
-      <el-form-item
-        label="操作人"
-        prop="operatorId"
-        v-if="selectOperator"
-      >
-        <el-select
-          v-model="form.operatorId"
-          :disabled="disabled && selectOperator || !isEdit"
-          multiple
-          placeholder="请选择"
-          style="width: 100%"
-        >
-          <el-option
-            v-for="item in operatorIdOptions"
-            :key="item.userId"
-            :label="item.name"
-            :value="item.userId"
-          ></el-option>
+      <el-form-item label="操作人" prop="operatorId" v-if="selectOperator">
+        <el-select v-model="form.operatorId" :disabled="disabled && selectOperator || !isEdit" multiple
+          placeholder="请选择" style="width: 100%">
+          <el-option v-for="item in operatorIdOptions" :key="item.userId" :label="item.name"
+            :value="item.userId"></el-option>
         </el-select>
       </el-form-item>
       <el-form-item label="附件" prop="attachList" v-if="!disabled && !selectOperator">
-        <upload-component
-          :accept="'*'"
-          v-model="form.attachList"
-          :file-obj-list="form.attachList"
-        />
+        <upload-component :accept="'*'" v-model="form.attachList" :file-obj-list="form.attachList" />
       </el-form-item>
       <el-form-item v-else prop="attachList">
-        <upload-component
-          :display="true"
-          :accept="'*'"
-          v-model="form.attachList"
-        />
+        <upload-component :display="true" :accept="'*'" v-model="form.attachList" />
       </el-form-item>
     </el-form>
   </div>
@@ -98,7 +50,7 @@ export default {
   props: {
     data: {
       type: Object,
-      default: () => {}
+      default: () => { }
     },
     disabled: {
       type: Boolean,
@@ -114,7 +66,7 @@ export default {
       default: false
     }
   },
-  data () {
+  data() {
     return {
       // 工种列表
       workTypeOptions: [],
@@ -149,9 +101,9 @@ export default {
         { value: '17', name: '其他' }
       ],
       rules: {
-        attachList: [
-          { required: true, message: '请上传附件', trigger: 'change' }
-        ],
+        // attachList: [
+        //   { required: true, message: '请上传附件', trigger: 'change' }
+        // ],
         nodeName: [
           { required: true, message: '请输入节点名称', trigger: 'blur' }
         ],
@@ -176,7 +128,7 @@ export default {
     }
   },
   watch: {
-    data (val) {
+    data(val) {
       this.node = val
       this.form = {
         ...this.form,
@@ -200,19 +152,19 @@ export default {
         })
       }
     },
-    disabled (val) {
+    disabled(val) {
       this.disabled = val
     },
-    isEdit (val) {
+    isEdit(val) {
       this.isEdit = val
     }
   },
-  activated () {},
-  created () {
+  activated() { },
+  created() {
     this.getWorkTypeOptions()
   },
   computed: {},
-  mounted () {
+  mounted() {
     this.node = this.data
     this.form = {
       ...this.form,
@@ -236,7 +188,7 @@ export default {
     this.getOperatorList()
   },
   methods: {
-    getWorkTypeOptions () {
+    getWorkTypeOptions() {
       this.workTypeOptions = []
       getWorkType().then(({ data }) => {
         if (data && data.code === '200') {
@@ -244,7 +196,7 @@ export default {
         }
       })
     },
-    onChage (val) {
+    onChage(val) {
       this.workTypeOptions.forEach((v) => {
         if (v.typeId === val) {
           this.form.quotedPrice = Number(v.quotedPrice || 0).toFixed(2)
@@ -252,7 +204,7 @@ export default {
       })
     },
     // 按工种ID查询操作人列表
-    getOperatorList () {
+    getOperatorList() {
       if (this.node.workTypeId) {
         workTypeMasterList(this.node.workTypeId).then(({ data }) => {
           if (data && data.code === '200') {
@@ -266,12 +218,12 @@ export default {
         })
       }
     },
-    uploadSuccess (fileList) {
+    uploadSuccess(fileList) {
       console.log('uploadSuccess')
       this.fileList = fileList
     },
     // 校验表单
-    validateFormData () {
+    validateFormData() {
       return new Promise((resolve, reject) => {
         this.$refs['form'].validate((valid) => {
           if (!valid) {
@@ -284,7 +236,7 @@ export default {
       })
     },
     // 获取表单数据
-    formData () {
+    formData() {
       const form = { ...this.form, operatorName: '' }
       form.attachList = []
       if (this.form.operatorId != null) {
@@ -312,10 +264,10 @@ export default {
       return form
     },
 
-    addRow () {
+    addRow() {
       this.form.prodProductionRequireList.push({})
     },
-    removeRow (index) {
+    removeRow(index) {
       this.form.prodProductionRequireList.splice(index, 1)
     }
   }

+ 61 - 157
src/components/work-flow/node-edit-final-check.vue

@@ -1,45 +1,22 @@
 <template>
   <div>
-    <el-form
-      :model="form"
-      ref="form"
-      :rules="rules"
-      label-width="100px"
-    >
+    <el-form :model="form" ref="form" :rules="rules" label-width="100px">
       <el-row>
         <el-col :span="8">
           <el-form-item label="工时单价">
-            <el-input
-              v-model="form.quotedPrice"
-              placeholder="工时单价"
-            ></el-input>
+            <el-input v-model="form.quotedPrice" placeholder="工时单价"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="工序要求"
-            prop="require"
-          >
-            <el-input
-              v-model="form.require"
-              :disabled="disabled || selectOperator"
-            ></el-input>
+          <el-form-item label="工序要求" prop="require">
+            <el-input v-model="form.require" :disabled="disabled || selectOperator"></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item
-            label="所需工时"
-            prop="preTaskTime"
-            v-if="node.type !== 'end'"
-          >
-            <el-input
-              v-model="form.preTaskTime"
-              :disabled="disabled || selectOperator"
-              oninput="value=value.replace(/[^0-9.]/g,'')"
-            >
-              <i slot="suffix" style="font-style: normal; margin-right: 10px"
-                >h</i
-              >
+          <el-form-item label="所需工时" prop="preTaskTime" v-if="node.type !== 'end'">
+            <el-input v-model="form.preTaskTime" :disabled="disabled || selectOperator"
+              oninput="value=value.replace(/[^0-9.]/g,'')">
+              <i slot="suffix" style="font-style: normal; margin-right: 10px">h</i>
             </el-input>
           </el-form-item>
         </el-col>
@@ -47,29 +24,13 @@
       <el-row>
         <el-col :span="8">
           <el-form-item label="操作人" v-if="form.operatorName && !selectOperator">
-            <el-input
-              :disabled="disabled && selectOperator"
-              v-model="form.operatorName"
-            ></el-input>
+            <el-input :disabled="disabled && selectOperator" v-model="form.operatorName"></el-input>
           </el-form-item>
-          <el-form-item
-            label="操作人"
-            prop="operatorId"
-            v-if="selectOperator"
-          >
-            <el-select
-              v-model="form.operatorId"
-              :disabled="disabled && selectOperator || !isEdit"
-              multiple
-              placeholder="请选择"
-              style="width: 100%"
-            >
-              <el-option
-                v-for="item in operatorIdOptions"
-                :key="item.userId"
-                :label="item.name"
-                :value="item.userId"
-              ></el-option>
+          <el-form-item label="操作人" prop="operatorId" v-if="selectOperator">
+            <el-select v-model="form.operatorId" :disabled="disabled && selectOperator || !isEdit" multiple
+              placeholder="请选择" style="width: 100%">
+              <el-option v-for="item in operatorIdOptions" :key="item.userId" :label="item.name"
+                :value="item.userId"></el-option>
             </el-select>
           </el-form-item>
         </el-col>
@@ -77,11 +38,7 @@
       <el-row>
         <el-col :span="24">
           <el-form-item label="备注" prop="notes">
-            <el-input
-              type="textarea"
-              v-model="form.notes"
-              :disabled="disabled || selectOperator"
-            ></el-input>
+            <el-input type="textarea" v-model="form.notes" :disabled="disabled || selectOperator"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -103,122 +60,69 @@
         <el-table :data="form.prodProductionRequireList" style="width: 100%">
           <el-table-column prop="pageNo" label="页次/图区">
             <template slot-scope="scope">
-              <el-form-item
-                :prop="'prodProductionRequireList.' + scope.$index + '.pageNo'"
-                :rules="rules.pageNo"
-                label-width="0px"
-              >
-                <el-input
-                  v-model="scope.row.pageNo"
-                  :disabled="disabled || selectOperator || isEdit"
-                ></el-input>
+              <el-form-item :prop="'prodProductionRequireList.' + scope.$index + '.pageNo'" :rules="rules.pageNo"
+                label-width="0px">
+                <el-input v-model="scope.row.pageNo" :disabled="disabled || selectOperator || isEdit"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="inspectionParam" label="检查参数">
             <template slot-scope="scope">
-              <el-form-item
-                :prop="
-                  'prodProductionRequireList.' +
-                  scope.$index +
-                  '.inspectionParam'
-                "
-                :rules="rules.inspectionParam"
-                label-width="0px"
-              >
-                <el-input
-                  v-model="scope.row.inspectionParam"
-                  :disabled="disabled || selectOperator || isEdit"
-                  @blur="inspectionParamBlur($event, scope.$index)"
-                ></el-input>
+              <el-form-item :prop="'prodProductionRequireList.' +
+                scope.$index +
+                '.inspectionParam'
+                " :rules="rules.inspectionParam" label-width="0px">
+                <el-input v-model="scope.row.inspectionParam" :disabled="disabled || selectOperator || isEdit"
+                  @blur="inspectionParamBlur($event, scope.$index)"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="inspectionMethod" label="检验方法">
             <template slot-scope="scope">
-              <el-form-item
-                :prop="
-                  'prodProductionRequireList.' +
-                  scope.$index +
-                  '.inspectionMethod'
-                "
-                :rules="rules.inspectionMethod"
-                label-width="0px"
-              >
-                <el-select
-                  v-model="scope.row.inspectionMethod"
-                  placeholder="请选择"
-                  style="width: 100%"
-                  :disabled="disabled || selectOperator || isEdit"
-                >
-                  <el-option
-                    v-for="item in inspectionMethodOptions"
-                    :key="item.value"
-                    :label="item.name"
-                    :value="item.value"
-                  ></el-option>
+              <el-form-item :prop="'prodProductionRequireList.' +
+                scope.$index +
+                '.inspectionMethod'
+                " :rules="rules.inspectionMethod" label-width="0px">
+                <el-select v-model="scope.row.inspectionMethod" placeholder="请选择" style="width: 100%"
+                  :disabled="disabled || selectOperator || isEdit">
+                  <el-option v-for="item in inspectionMethodOptions" :key="item.value" :label="item.name"
+                    :value="item.value"></el-option>
                 </el-select>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="allowValues" label="允许值">
             <template slot-scope="scope">
-              <el-form-item
-                :prop="
-                  'prodProductionRequireList.' + scope.$index + '.allowValues'
-                "
-                :rules="rules.allowValues"
-                label-width="0px"
-              >
-                <el-input
-                  v-model="scope.row.allowValues"
-                  :disabled="disabled || selectOperator || isEdit"
-                ></el-input>
+              <el-form-item :prop="'prodProductionRequireList.' + scope.$index + '.allowValues'
+                " :rules="rules.allowValues" label-width="0px">
+                <el-input v-model="scope.row.allowValues" :disabled="disabled || selectOperator || isEdit"></el-input>
               </el-form-item>
             </template>
           </el-table-column>
           <el-table-column prop="measureRecord1" label="实测记录1">
             <template slot-scope="scope">
-              <div style="margin-bottom:22px;">{{scope.row.measureRecord1}}</div>
+              <div style="margin-bottom:22px;">{{ scope.row.measureRecord1 }}</div>
             </template>
           </el-table-column>
           <el-table-column prop="measureRecord2" label="实测纪录2">
             <template slot-scope="scope">
-              <div style="margin-bottom:22px;">{{scope.row.measureRecord2}}</div>
+              <div style="margin-bottom:22px;">{{ scope.row.measureRecord2 }}</div>
             </template>
           </el-table-column>
           <el-table-column label="操作" width="140px" v-if="!disabled && !isEdit">
             <template slot-scope="scope">
-              <el-button
-                type="primary"
-                icon="el-icon-circle-plus"
-                circle
-                @click="addRow"
-              ></el-button>
-              <el-button
-                type="danger"
-                icon="el-icon-delete"
-                circle
-                @click="removeRow(scope.$index)"
-                v-if="scope.$index > 0"
-              ></el-button>
+              <el-button type="primary" icon="el-icon-circle-plus" circle @click="addRow"></el-button>
+              <el-button type="danger" icon="el-icon-delete" circle @click="removeRow(scope.$index)"
+                v-if="scope.$index > 0"></el-button>
             </template>
           </el-table-column>
         </el-table>
       </el-row>
       <el-form-item label="附件" prop="attachList" v-if="!disabled && !selectOperator">
-        <upload-component
-          :accept="'*'"
-          v-model="form.attachList"
-          :file-obj-list="form.attachList"
-        />
+        <upload-component :accept="'*'" v-model="form.attachList" :file-obj-list="form.attachList" />
       </el-form-item>
       <el-form-item v-else prop="attachList">
-        <upload-component
-          :display="true"
-          :accept="'*'"
-          v-model="form.attachList"
-        />
+        <upload-component :display="true" :accept="'*'" v-model="form.attachList" />
       </el-form-item>
     </el-form>
   </div>
@@ -235,7 +139,7 @@ export default {
   props: {
     data: {
       type: Object,
-      default: () => {}
+      default: () => { }
     },
     disabled: {
       type: Boolean,
@@ -251,7 +155,7 @@ export default {
       default: false
     }
   },
-  data () {
+  data() {
     return {
       // 工种列表
       workTypeOptions: [],
@@ -286,9 +190,9 @@ export default {
         { value: '17', name: '其他' }
       ],
       rules: {
-        attachList: [
-          { required: true, message: '请上传附件', trigger: 'change' }
-        ],
+        // attachList: [
+        //   { required: true, message: '请上传附件', trigger: 'change' }
+        // ],
         nodeName: [
           { required: true, message: '请输入节点名称', trigger: 'blur' }
         ],
@@ -313,7 +217,7 @@ export default {
     }
   },
   watch: {
-    data (val) {
+    data(val) {
       this.node = val
       this.form = {
         ...this.form,
@@ -337,19 +241,19 @@ export default {
       //   })
       // }
     },
-    disabled (val) {
+    disabled(val) {
       this.disabled = val
     },
-    isEdit (val) {
+    isEdit(val) {
       this.isEdit = val
     }
   },
-  activated () {},
-  created () {
+  activated() { },
+  created() {
     this.getWorkTypeOptions()
   },
   computed: {},
-  mounted () {
+  mounted() {
     this.node = this.data
     this.form = {
       ...this.form,
@@ -373,7 +277,7 @@ export default {
     this.getOperatorList()
   },
   methods: {
-    getWorkTypeOptions () {
+    getWorkTypeOptions() {
       this.workTypeOptions = []
       getWorkType().then(({ data }) => {
         if (data && data.code === '200') {
@@ -381,7 +285,7 @@ export default {
         }
       })
     },
-    onChage (val) {
+    onChage(val) {
       this.workTypeOptions.forEach((v) => {
         if (v.typeId === val) {
           this.form.quotedPrice = Number(v.quotedPrice || 0).toFixed(2)
@@ -389,7 +293,7 @@ export default {
       })
     },
     // 按工种ID查询操作人列表
-    getOperatorList () {
+    getOperatorList() {
       if (this.node.workTypeId) {
         workTypeMasterList(this.node.workTypeId).then(({ data }) => {
           if (data && data.code === '200') {
@@ -404,7 +308,7 @@ export default {
       }
     },
     // 校验表单
-    validateFormData () {
+    validateFormData() {
       return new Promise((resolve, reject) => {
         this.$refs['form'].validate((valid) => {
           if (!valid) {
@@ -417,7 +321,7 @@ export default {
       })
     },
     // 获取表单数据
-    formData () {
+    formData() {
       const form = { ...this.form, operatorName: '' }
       form.attachList = []
       if (this.form.operatorId != null) {
@@ -445,13 +349,13 @@ export default {
       return form
     },
 
-    addRow () {
+    addRow() {
       this.form.prodProductionRequireList.push({})
     },
-    removeRow (index) {
+    removeRow(index) {
       this.form.prodProductionRequireList.splice(index, 1)
     },
-    inspectionParamBlur (event, index) {
+    inspectionParamBlur(event, index) {
       console.log(event)
       console.log(event.target.value)
       this.$http({