chencc hai 1 ano
pai
achega
f6c7691f09
Modificáronse 2 ficheiros con 168 adicións e 2 borrados
  1. 9 0
      src/utils/request.js
  2. 159 2
      src/views/technology/production/components/user-edit.vue

+ 9 - 0
src/utils/request.js

@@ -55,6 +55,15 @@ service.interceptors.response.use(
       );
       return false;
     }
+    if (Number(res.data.code) == 500 ) {
+      Message.error({
+        dangerouslyUseHTMLString: true,
+        message:res.data.message}
+      );
+      return false;
+    }
+
+
     const token = res.headers[TOKEN_HEADER_NAME.toLowerCase()];
     if (token) {
       setToken(token);

+ 159 - 2
src/views/technology/production/components/user-edit.vue

@@ -164,6 +164,134 @@
           </el-form-item>
         </el-col>
       </el-row>
+
+      <header-title title="工序配置"></header-title>
+
+      <el-row>
+
+        <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-group>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <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-group>
+          </el-form-item>
+        </el-col>
+
+        <!-- **** -->
+        <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-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-group>
+          </el-form-item>
+        </el-col>
+
+        <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-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-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-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-group>
+          </el-form-item>
+        </el-col>
+
+
+        <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-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-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-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-group>
+          </el-form-item>
+        </el-col>
+
+        <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-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-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-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-group>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+      
     </el-form>
 
     <template v-slot:footer>
@@ -206,6 +334,22 @@ export default {
         workCenterId: '',
         workCenterName: '',
         timeUnit: '',
+        feedNeedTurnover:'',
+        reportNeedTurnover:'',
+        feedNeedEquipment:'',
+        reportNeedEquipment:'',
+        feedNeedMould:'',
+        feedNeedBoat:'',
+        feedNeedConsumableMaterial:'',
+        feedNeedMateriel:'',
+        feedNeedProduct:'',
+        feedNeedSemiProduct:'',
+        feedNeedJunkProduct:'',
+        feedNeedReworkProduct:'',
+        feedNeedAridRegion:'',
+        feedNeedAuxiliaryEquipment:'',
+        feedNeedMeasuringEquipment:'',
+        feedNeedQuality:'',
         sort: null,
         intervalTime: {
           nextShortPreTime: '', // 时间单位转换后的下一个短周期的时间,格式为YYYY-MM-DDTHH'
@@ -216,7 +360,7 @@ export default {
           thisStandardBoatTime: '',
           thisStandardWaitTime: ''
         },
-
+       
         workBeat: {
           beatProduceNum: '',
           beatProduceUnit: '',
@@ -240,7 +384,16 @@ export default {
         { code: 1, label: '分' },
         { code: 2, label: '时' }
       ],
-
+      radioList:[
+          {
+            name:'是',
+            value:1
+          },
+          {
+            name:'否',
+            value:0
+          }
+        ],
 
       timeType2: [
         { code: '1', label: '分' },
@@ -344,11 +497,15 @@ export default {
   watch: {
     async visible(visible) {
       if (visible) {
+
+        console.log(this.form,'this.form');
         if (this.data) {
           const res = await producetask.getById(this.data.id);
+          
           this.$util.assignObject(this.form, {
             ...res
           });
+
           this.isUpdate = true;
         } else {
           this.form = { ...this.defaultForm() };