bugfix

src/components/work-flow/home.vue

@@ -74,6 +74,7 @@
           :disabled="disabled"
           :isEdit="isEdit"
           :selectOperator="selectOperator"
+          :sourceType="sourceType"
           @setNode="setNode"
           @deleteNode="deleteNode"
           @changeLineState="changeLineState"
@@ -127,6 +128,10 @@ export default {
     nodeTypeList: {
       type: Array,
       default: () => []
+    },
+    sourceType: {
+      type: String,
+      default: ''
     }
   },
   data () {

src/components/work-flow/node-edit-check.vue

@@ -10,25 +10,25 @@
         <el-input
           v-model="form.quotedPrice"
           placeholder="工时单价"
-          :disabled="disabled || !isEdit"
+          :disabled="disabled"
         ></el-input>
       </el-form-item>
       <el-form-item label="备注" prop="notes">
         <el-input
           v-model="form.notes"
-          :disabled="disabled || selectOperator || !isEdit"
+          :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 || !isEdit"
+          :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 || !isEdit"
+          :disabled="disabled || selectOperator"
         ></el-input>
       </el-form-item>
       <el-form-item

src/components/work-flow/node-edit-end.vue

@@ -10,7 +10,6 @@
       <el-form-item label="备注" prop="notes">
         <el-input
           v-model="form.notes"
-          :disabled="disabled || selectOperator"
         ></el-input>
       </el-form-item>
       <el-form-item label="操作人" v-if="form.operatorName && !selectOperator">

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

@@ -12,7 +12,6 @@
             <el-input
               v-model="form.quotedPrice"
               placeholder="工时单价"
-              disabled
             ></el-input>
           </el-form-item>
         </el-col>
@@ -20,11 +19,10 @@
           <el-form-item
             label="工序要求"
             prop="require"
-            v-if="node.type !== 'end'"
           >
             <el-input
               v-model="form.require"
-              :disabled="disabled || selectOperator || !isEdit"
+              :disabled="disabled || selectOperator"
             ></el-input>
           </el-form-item>
         </el-col>
@@ -50,7 +48,7 @@
         <el-col :span="8">
           <el-form-item label="操作人" v-if="form.operatorName && !selectOperator">
             <el-input
-              :disabled="disabled && selectOperator || !isEdit"
+              :disabled="disabled && selectOperator"
               v-model="form.operatorName"
             ></el-input>
           </el-form-item>
@@ -131,6 +129,7 @@
                 <el-input
                   v-model="scope.row.inspectionParam"
                   :disabled="disabled || selectOperator || isEdit"
+                  @blur="inspectionParamBlur($event, scope.$index)"
                 ></el-input>
               </el-form-item>
             </template>
@@ -451,6 +450,18 @@ export default {
     },
     removeRow (index) {
       this.form.prodProductionRequireList.splice(index, 1)
+    },
+    inspectionParamBlur (event, index) {
+      console.log(event)
+      console.log(event.target.value)
+      this.$http({
+        url: this.$http.adornUrl(`/biz-service/technology/infoArgument/${event.target.value}`),
+        method: 'get'
+      }).then(({ data }) => {
+        console.log(data)
+        this.form.prodProductionRequireList[index].allowValues = data
+        console.log(this.form.prodProductionRequireList)
+      })
     }
   }
 }

src/components/work-flow/node-edit-normal.vue

@@ -35,7 +35,6 @@
       <el-form-item
         label="所需工时"
         prop="preTaskTime"
-        v-if="node.type !== 'end'"
       >
         <el-input
           v-model="form.preTaskTime"
@@ -45,11 +44,19 @@
           <i slot="suffix" style="font-style: normal; margin-right: 10px">h</i>
         </el-input>
       </el-form-item>
-      <el-form-item label="是否编程" prop="isProgramme">
+      <el-form-item label="是否编程" prop="isProgramme" v-if="!disabled && !selectOperator">
         <el-radio-group v-model="form.isProgramme">
           <el-radio :label="2">是</el-radio>
           <el-radio :label="1">否</el-radio>
         </el-radio-group>
+      </el-form-item>
+       <el-form-item label="要求完成时间" prop="planCompletionTime" v-if="selectOperator">
+          <el-date-picker
+            v-model="form.planCompletionTime"
+            value-format="yyyy-MM-dd"
+            type="date"
+          >
+          </el-date-picker>
       </el-form-item>
       <el-form-item label="操作人" v-if="form.operatorName && !selectOperator">
         <el-input

src/components/work-flow/node-edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div style="margin:10px 10px">
-    <el-form>
+    <el-form v-if="sourceType == '1'">
       <el-form-item label="节点类型" label-width="100px">
         <el-select v-model="node.type" placeholder="请选择">
           <el-option
@@ -12,10 +12,10 @@
         </el-select>
       </el-form-item>
     </el-form>
-    <node-edit-normal ref="form" v-if="node.type == 'start' || node.type == 'produce'" :data="node"/>
-    <node-edit-check ref="form" v-if="node.type == 'check'" :data="node"/>
-    <node-edit-final-check ref="form" v-if="node.type == 't-check'" :data="node"/>
-    <node-edit-end ref="form" v-if="node.type == 'end'" :data="node"/>
+    <node-edit-normal ref="form" v-if="node.type == 'start' || node.type == 'produce'" :data="node" :selectOperator="selectOperator" :isEdit="isEdit"/>
+    <node-edit-check ref="form" v-if="node.type == 'check'" :data="node" :selectOperator="selectOperator" :isEdit="isEdit"/>
+    <node-edit-final-check ref="form" v-if="node.type == 't-check'" :data="node" :selectOperator="selectOperator" :isEdit="isEdit"/>
+    <node-edit-end ref="form" v-if="node.type == 'end'" :data="node" :selectOperator="selectOperator" :isEdit="isEdit"/>
   </div>
 </template>
 
@@ -48,6 +48,10 @@ export default {
     isEdit: {
       type: Boolean,
       default: false
+    },
+    sourceType: {
+      type: String,
+      default: ''
     }
   },
   data () {

src/components/work-flow/node-item.vue

@@ -40,13 +40,15 @@
       :append-to-body="true"
       width="60%"
     >
-    <div style="height:400px;overflow:auto">
+    <!-- <div style="height:600px;overflow:auto"> -->
+    <div style="height:600px;overflow:auto">
       <nodeEdit
         ref="nodeEdit"
         :data="dialog.data"
         :disabled="disabled"
         :isEdit="isEdit"
         :selectOperator="selectOperator"
+        :sourceType="sourceType"
       ></nodeEdit>
     </div>
     <div slot="footer">
@@ -86,6 +88,10 @@ export default {
     isEdit: {
       type: Boolean,
       default: false
+    },
+    sourceType: {
+      type: String,
+      default: ''
     }
   },
   directives: {

src/views/modules/tech/ctafts-add-or-detail-v2.vue

@@ -78,6 +78,7 @@
           @saveWorkFlow="saveWorkFlow"
           :isEdit="isEdit"
           @dataChange="workFlowDataChange"
+          :sourceType="1"
         ></work-flow>
       </el-row>
     </el-form>