排产基本能力问题调整

src/views/processManagement/basicProcesses.vue

@@ -7,15 +7,12 @@
       v-model="form"
       v-model:page="page"
       ref="crud"
-      @row-del="rowDel"
       @search-change="searchChange"
       @search-reset="searchReset"
-      @selection-change="selectionChange"
       @current-change="currentChange"
       @size-change="sizeChange"
       @refresh-change="refreshChange"
       @on-load="onLoad"
-      @row-save="rowSave"
     >
       <template #menu-left>
         <el-button type="primary" @click="addFn">新增</el-button>
@@ -53,9 +50,6 @@
         <el-tag v-if="scope.row.isCheckout == 1" type="success">是</el-tag>
         <el-tag v-else type="danger">否</el-tag>
       </template>
-      <template #cyropactorControl-label="{ type, disabled }">
-        <span></span>
-      </template>
 
       <template #name="{ row }">
         <i :class="row.source" style="margin-right: 5px" />
@@ -99,8 +93,6 @@
 <script>
 import { getList, remove, add } from '@/api/processManagement/basicProcesses';
 import addBasicProcessesDialog from './components/addBasicProcessesDialog.vue';
-import { mapGetters } from 'vuex';
-import { getDictionary } from '@/api/system/dict';
 import setCrew from './components/setCrew.vue';
 import basicImport from '@/components/basic-import/main.vue';
 export default {
@@ -177,13 +169,7 @@ export default {
             headerAlign: 'center',
             align: 'center',
             searchLabelWidth: 45,
-            rules: [
+           
-              {
-                required: true,
-                message: '请输入配置码',
-                trigger: 'blur',
-              },
-            ],
           },
           {
             label: '名称',
@@ -196,13 +182,7 @@ export default {
             headerAlign: 'center',
             align: 'left',
             searchLabelWidth: 45,
-            rules: [
+           
-              {
-                required: true,
-                message: '请选择镀种分类',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '是否检验工序',
@@ -228,13 +208,7 @@ export default {
                 value: '0',
               },
             ],
-            rules: [
+            
-              {
-                required: false,
-                message: '请选择',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '不分派',
@@ -259,13 +233,7 @@ export default {
                 value: '2',
               },
             ],
-            rules: [
+            
-              {
-                required: false,
-                message: '请输入镀种',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '特殊',
@@ -290,13 +258,7 @@ export default {
                 value: '2',
               },
             ],
-            rules: [
+            
-              {
-                required: false,
-                message: '请输入镀层编码',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '主工序',
@@ -306,13 +268,7 @@ export default {
             span: 8,
             headerAlign: 'center',
             align: 'center',
-            rules: [
+           
-              {
-                required: false,
-                message: '请输入镀种小类',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '班组',
@@ -323,13 +279,7 @@ export default {
             display: false,
             headerAlign: 'center',
             align: 'left',
-            rules: [
+            
-              {
-                required: false,
-                message: '请输入材料',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '标准周期',
@@ -340,13 +290,7 @@ export default {
             span: 24,
             headerAlign: 'center',
             align: 'center',
-            rules: [
+            
-              {
-                required: true,
-                message: '请输入标准周期',
-                trigger: 'click',
-              },
-            ],
           },
           {
             label: '电流(A)',
@@ -469,7 +413,6 @@ export default {
         this.data = res.data.data.records;
         this.loading = false;
         this.page.total = res.data.data.total;
-        this.selectionClear();
       });
     },
   },

src/views/processManagement/components/processMainte/dsPartBasicInfo.vue

@@ -46,9 +46,9 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8" v-if="partType == '烧结'">
+          <el-col :span="8" >
             <el-form-item label="是否印字:" prop="isPrint">
-              <el-radio-group v-model="formData.isPrint" v-if="!formData.isGlassCake">
+              <el-radio-group v-if="partType != '烧结'&&!formData.isGlassCake" v-model="formData.isPrint">
                 <el-radio value="1">否</el-radio>
                 <el-radio value="2">单</el-radio>
                 <el-radio value="3">双</el-radio>
@@ -171,11 +171,30 @@
               <el-input v-model="formData.productApplicationArea" placeholder="请输入" />
             </el-form-item>
           </el-col>
+          <el-col :span="8" v-if="partType == '烧结'">
+            <el-form-item label="玻璃饼直径">
+              <el-input-number
+                :max="100000"
+                :min="0"
+                v-model="formData.blbDiameter"
+                precision="10"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" v-if="partType == '烧结'">
+            <el-form-item label="壳体最大外径">
+              <el-input-number
+                :max="100000"
+                :min="0"
+                v-model="formData.externalDiameter"
+                precision="10"
+              />
+            </el-form-item>
+          </el-col>
         </el-row>
 
         <el-row :gutter="24">
           <el-col :span="16">
-            <!-- prop="craftWay" -->
             <el-form-item label="工艺路线:">
               {{ formData.craftWay }}
             </el-form-item>
@@ -320,7 +339,7 @@
                   >喷码</el-checkbox
                 >
               </div>
-              <div style="width: 100%" v-if="formData.goldMark&&partType == '热表'">
+              <div style="width: 100%" v-if="formData.goldMark && partType == '热表'">
                 <el-text class="mx-1" type="danger">本零件需要编制一级和二级工艺！</el-text>
               </div>
             </el-form-item>
@@ -657,8 +676,8 @@ export default {
           return item.partCode == this.formData.partCode;
         });
         if (selPart.lenght > 0) {
-          if(this.partType==''){
+          if (this.partType == '') {
-            this.formData.goldMark = true
+            this.formData.goldMark = true;
           }
         }
       });

src/views/processManagement/procepssPlanning.vue

@@ -177,6 +177,7 @@ export default {
             clearable: true,
             headerAlign: 'center',
             align: 'center',
+            width: 170,
             dicData: [
               {
                 label: '烧结零件',
@@ -208,6 +209,7 @@ export default {
             overHidden: true,
             headerAlign: 'center',
             align: 'center',
+            width: 170,
           },
           {
             label: '到期时间',
@@ -218,6 +220,7 @@ export default {
             headerAlign: 'center',
             align: 'center',
             type: 'date',
+            width: 170,
             searchRange: true,
             startPlaceholder: '开始时间',
             endPlaceholder: '结束时间',

src/views/productionManagement/components/outsourceDialog.vue

@@ -19,16 +19,16 @@
     </el-form>
     <el-table :data="outsourceData">
       <el-table-column align="center" type="selection"></el-table-column>
-      <el-table-column align="center" label="工序号" prop="prWorkPlan.orders"></el-table-column>
+      <el-table-column align="center" label="工序号" prop="workPlan.processSet.code"></el-table-column>
       <el-table-column
         align="center"
         label="工序代码"
-        prop="prWorkPlan.procedureSet.ppsCode"
+        prop="workPlan.processSet.code"
       ></el-table-column>
       <el-table-column
         align="center"
         label="工序名称"
-        prop="prWorkPlan.procedureSet.ppsName"
+        prop="workPlan.processSet.name"
       ></el-table-column>
 
       <el-table-column align="center" label="工艺能力" prop="caId">

src/views/productionSchedulingPlan/basic/oemProcess.vue

@@ -100,7 +100,7 @@ export default {
             span: 12,
             type: 'select',
             filterable: true,
-            multiple: true,
+            multiple: false,
             hide: true,
             dicUrl: '/blade-scheduling/processSet/findList',
             props: {