Merge branch 'test' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into test

src/views/technology/production/components/user-edit.vue

@@ -33,7 +33,7 @@
         <el-col :span="8">
           <el-form-item label="工序类型:" prop="type">
             <el-select v-model="form.type" filterable>
-              <el-option :label="item.label" :value="item.value" v-for="(item, index) in typeList " :key="index">
+              <el-option :label="item.label" :value="item.value" v-for="(item, index) in typeList" :key="index">
               </el-option>
 
             </el-select>
@@ -43,7 +43,7 @@
 
         <el-col :span="8">
           <el-form-item label="排序:" prop="sort">
-            <el-input  v-model="form.sort"  />
+            <el-input v-model="form.sort" />
           </el-form-item>
         </el-col>
 
@@ -172,15 +172,15 @@
         <el-col :span="12">
           <el-form-item label="投料是否要添加周转车:" label-width="200px">
             <el-radio-group v-model="form.feedNeedTurnover">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
 
         <el-col :span="12">
-          <el-form-item label="报工是否要添加周转车:"  label-width="200px">
+          <el-form-item label="报工是否要添加周转车:" label-width="200px">
             <el-radio-group v-model="form.reportNeedTurnover">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -189,15 +189,15 @@
         <el-col :span="12">
           <el-form-item label="投料是否要添加生产设备:" label-width="200px">
             <el-radio-group v-model="form.feedNeedEquipment">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
-          
+
         </el-col>
         <el-col :span="12">
           <el-form-item label="报工是否要添加生产设备:" label-width="200px">
             <el-radio-group v-model="form.reportNeedEquipment">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -205,28 +205,28 @@
         <el-col :span="12">
           <el-form-item label="投料是否要添加模具:" label-width="200px">
             <el-radio-group v-model="form.feedNeedMould">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="投料是否要添加舟皿:" label-width="200px">
             <el-radio-group v-model="form.feedNeedBoat">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="投料是否要添加消耗材料:" label-width="200px">
             <el-radio-group v-model="form.feedNeedConsumableMaterial">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="投料是否要添加物料:" label-width="200px">
             <el-radio-group v-model="form.feedNeedMateriel">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -235,28 +235,28 @@
         <el-col :span="12">
           <el-form-item label="投料是否要添加产品:" label-width="200px">
             <el-radio-group v-model="form.feedNeedProduct">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="投料是否要添加半成品:" label-width="200px">
             <el-radio-group v-model="form.feedNeedSemiProduct">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="投料是否要添加废品:" label-width="200px">
             <el-radio-group v-model="form.feedNeedJunkProduct">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="投料是否要添加返工反修品:" label-width="200px">
             <el-radio-group v-model="form.feedNeedReworkProduct">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
@@ -264,34 +264,40 @@
         <el-col :span="12">
           <el-form-item label="投料是否要添加干燥区:" label-width="200px">
             <el-radio-group v-model="form.feedNeedAridRegion">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="投料是否要添加生产辅助设备:" label-width="200px">
             <el-radio-group v-model="form.feedNeedAuxiliaryEquipment">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="投料是否要添加仪表计量设备:" label-width="200px">
             <el-radio-group v-model="form.feedNeedMeasuringEquipment">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="投料是否需要质检:" label-width="200px">
             <el-radio-group v-model="form.feedNeedQuality">
-              <el-radio :label="item.value" v-for="(item,i) in radioList" :key="i">{{ item.name }}</el-radio>
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="生产质检是否需要处置再报工:" label-width="200px">
+            <el-radio-group v-model="form.isReportProcessProduce">
+              <el-radio :label="item.value" v-for="(item, i) in radioList" :key="i">{{ item.name }}</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>
-
       </el-row>
-      
+
     </el-form>
 
     <template v-slot:footer>
@@ -334,22 +340,23 @@ export default {
         workCenterId: '',
         workCenterName: '',
         timeUnit: '',
-        feedNeedTurnover:'',
-        reportNeedTurnover:'',
-        feedNeedEquipment:'',
-        reportNeedEquipment:'',
-        feedNeedMould:'',
-        feedNeedBoat:'',
-        feedNeedConsumableMaterial:'',
-        feedNeedMateriel:'',
-        feedNeedProduct:'',
-        feedNeedSemiProduct:'',
-        feedNeedJunkProduct:'',
-        feedNeedReworkProduct:'',
-        feedNeedAridRegion:'',
-        feedNeedAuxiliaryEquipment:'',
-        feedNeedMeasuringEquipment:'',
-        feedNeedQuality:'',
+        feedNeedTurnover: '',
+        reportNeedTurnover: '',
+        feedNeedEquipment: '',
+        reportNeedEquipment: '',
+        feedNeedMould: '',
+        feedNeedBoat: '',
+        feedNeedConsumableMaterial: '',
+        feedNeedMateriel: '',
+        feedNeedProduct: '',
+        feedNeedSemiProduct: '',
+        feedNeedJunkProduct: '',
+        feedNeedReworkProduct: '',
+        feedNeedAridRegion: '',
+        feedNeedAuxiliaryEquipment: '',
+        feedNeedMeasuringEquipment: '',
+        feedNeedQuality: '',
+        isReportProcessProduce:'',
         sort: null,
         intervalTime: {
           nextShortPreTime: '', // 时间单位转换后的下一个短周期的时间，格式为YYYY-MM-DDTHH'
@@ -360,7 +367,7 @@ export default {
           thisStandardBoatTime: '',
           thisStandardWaitTime: ''
         },
-       
+
         workBeat: {
           beatProduceNum: '',
           beatProduceUnit: '',
@@ -384,16 +391,16 @@ export default {
         { code: 1, label: '分' },
         { code: 2, label: '时' }
       ],
-      radioList:[
-          {
-            name:'是',
-            value:1
-          },
-          {
-            name:'否',
-            value:0
-          }
-        ],
+      radioList: [
+        {
+          name: '是',
+          value: 1
+        },
+        {
+          name: '否',
+          value: 0
+        }
+      ],
 
       timeType2: [
         { code: '1', label: '分' },
@@ -498,10 +505,10 @@ export default {
     async visible(visible) {
       if (visible) {
 
-        console.log(this.form,'this.form');
+        console.log(this.form, 'this.form');
         if (this.data) {
           const res = await producetask.getById(this.data.id);
-          
+
           this.$util.assignObject(this.form, {
             ...res
           });