删除不想要的字段

src/views/mes/pro/feedback/index.vue

@@ -70,8 +70,6 @@
       <el-table-column label="产品物料编码" width="120" align="center" prop="sapItemCode" />
       <el-table-column label="产品物料名称" min-width="250" show-overflow-tooltip align="center" prop="itemName" />
       <el-table-column label="规格型号" width="100" align="center" prop="specification" />
-      <el-table-column label="指令号" width="120" align="center" prop="clientCmd" />
-      <el-table-column label="标准SIZE" width="120" align="center" prop="standardSize" />
       <el-table-column label="报工数量" align="center" prop="feedbackTime" width="180">
         <template slot-scope="scope">
           <span>{{ getSumNumber(scope.row) }}</span>
@@ -85,7 +83,6 @@
           <span>{{ parseTime(scope.row.feedbackTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="审核人" width="100" align="center" prop="recordNick" />
       <el-table-column label="操作" align="center" fixed="right" width="160px" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-query" @click="handleView(scope.row)"
@@ -203,8 +200,6 @@
               <el-input-number :min="0" v-model="form.machineTime" placeholder="请输入加工工时" />
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row>
           <el-col :span="8">
             <el-form-item label="报工人" prop="nickName">
               <el-input v-model="form.nickName" placeholder="请选择报工人">
@@ -220,14 +215,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="审核人" prop="recordNick">
-              <el-input v-model="form.recordNick" placeholder="请选择审核人">
-                <el-button slot="append" @click="handleUser2Select" icon="el-icon-search"></el-button>
-              </el-input>
-            </el-form-item>
-            <UserSingleSelect ref="user2Select" @onSelected="onUser2Selected"></UserSingleSelect>
-          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -650,16 +637,7 @@ export default {
     onUserSelected(row) {
       this.form.nickName = row.nickName;
       this.form.userName = row.userName;
-    },
-    //点击人员选择按钮
-    handleUser2Select() {
-      this.$refs.user2Select.showFlag = true;
-    },
-    //人员选择返回
-    onUser2Selected(row) {
-      this.form.recordUser = row.userName;
-      this.form.recordNick = row.nickName;
-    },
+    }
   }
 };
 </script>

src/views/mes/pro/productionSolution/components/ProogingProcess.vue

@@ -25,9 +25,7 @@
         </template>
       </el-table-column>
       <el-table-column label="基本数量" prop="quantity" align="center" />
-      <el-table-column label="固化时间" prop="solidifyTime" align="center" />
       <el-table-column label="计量单位" prop="unitOfMeasure" align="center" />
-      <el-table-column label="雇员数量" prop="employeesNum" align="center" />
       <el-table-column label="关键工序" prop="keyFlag" align="center">
         <template slot-scope="scope">
           <dict-tag
@@ -44,95 +42,6 @@
           />
         </template>
       </el-table-column>
-      <el-table-column label="封切机开边" prop="sacmForEdgeOpening" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForEdgeOpening"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机粘贴复合" prop="sacmForPasteComposite" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForPasteComposite"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机热复合" prop="sacmForThermalComposite" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForThermalComposite"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机贴标" prop="sacmForLabeling" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForLabeling"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机装扣" prop="sacmForBuckleUp" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForBuckleUp"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机压痕" prop="sacmForCreasing" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForCreasing"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机风琴" prop="sacmForOrgan" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForOrgan"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机热切" prop="sacmForThermalCutting" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForThermalCutting"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机热自合" prop="sacmForThermalSelfFusion" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForThermalSelfFusion"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机压齿" prop="sacmForMolarTooth" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForMolarTooth"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="封切机分切" prop="sacmForSlitting" align="center">
-        <template slot-scope="scope">
-          <dict-tag
-            :options="dict.type.sys_yes_no"
-            :value="scope.row.sacmForSlitting"
-          />
-        </template>
-      </el-table-column>
-      <el-table-column label="工序备注" prop="processRemark" align="center" />
       <el-table-column
         v-if="mode != 'info'"
         label="操作"
@@ -291,13 +200,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="固化时间" label-width="120px" prop="solidifyTime">
-              <el-input v-model="form.solidifyTime" placeholder="请输入固化时间">
-                <i slot="suffix" style="font-style:normal;margin-right: 10px; line-height: 30px; color: #1e1e1e">MIN</i>
-              </el-input>
-            </el-form-item>
-          </el-col>
 
           <el-col :span="12">
             <el-form-item label="单位转换比例" prop="unitConvert">
@@ -308,15 +210,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="雇员数量" prop="employeesNum">
-              <el-input
-                type="number"
-                v-model="form.employeesNum"
-                placeholder="请输入雇员数量"
-              ></el-input>
-            </el-form-item>
-          </el-col>
           <el-col :span="12">
             <el-form-item label="加工方式" prop="processingMethod">
               <el-select
@@ -405,72 +298,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-form-item>
-          <el-checkbox
-            v-model="form.sacmForEdgeOpening"
-            true-label="Y"
-            false-label="N"
-            >开边</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForPasteComposite"
-            true-label="Y"
-            false-label="N"
-            >粘贴符合</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForThermalComposite"
-            true-label="Y"
-            false-label="N"
-            >热复合</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForLabeling"
-            true-label="Y"
-            false-label="N"
-            >粘标</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForBuckleUp"
-            true-label="Y"
-            false-label="N"
-            >装扣</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForCreasing"
-            true-label="Y"
-            false-label="N"
-            >压痕</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForOrgan"
-            true-label="Y"
-            false-label="N"
-            >风琴</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForThermalCutting"
-            true-label="Y"
-            false-label="N"
-            >热切</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForThermalSelfFusion"
-            true-label="Y"
-            false-label="N"
-            >热自合</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForMolarTooth"
-            true-label="Y"
-            false-label="N"
-            >压齿</el-checkbox>
-            <el-checkbox
-            v-model="form.sacmForSlitting"
-            true-label="Y"
-            false-label="N"
-            >分切</el-checkbox>
-         </el-form-item> 
-          <el-col :span="12">
-            <el-form-item label="备注" prop="remark">
-              <el-input
-                type="textarea"
-                v-model="form.remark"
-                placeholder="请输入工序备注"
-              ></el-input>
-            </el-form-item>
-          </el-col>
         </el-row>
       </el-form>
       <div slot="footer">

src/views/mes/pro/productionSolution/proofingInfo.vue

@@ -73,28 +73,6 @@
               <el-input v-model="form.itemName" disabled placeholder></el-input>
             </el-form-item>
           </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="组件号" prop="groupCounter">
-              <el-input
-                v-model="form.groupCounter"
-                disabled
-                placeholder
-              ></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="SAP生产用途" prop="sapUsageId">
-              <el-select v-model="form.sapUsageId" placeholder="请选择SAP用途">
-                <el-option
-                  v-for="dict in dict.type.production_solution_usage"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                >
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="有效起始日期" prop="startDate">
               <el-date-picker
@@ -119,24 +97,6 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="最小批量" prop="minLot">
-              <el-input-number
-                :min="1"
-                v-model="form.minLot"
-                placeholder="请输入最小批量"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="最大批量" prop="maxLot">
-              <el-input-number
-                :min="1"
-                v-model="form.maxLot"
-                placeholder="请输入最大批量"
-              />
-            </el-form-item>
-          </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="单位" prop="unitOfMeasure">
               <el-input
@@ -168,12 +128,6 @@
         <el-tab-pane label="工艺">
           <ProogingProcess ref="ProogingProcessRef" :bomList="bomList" />
         </el-tab-pane>
-        <el-tab-pane label="规格书">
-          <ProogingSpecificationSheet
-            ref="ProogingSpecificationSheetRef"
-            :specificationSheet="specificationSheet"
-          />
-        </el-tab-pane>
       </el-tabs>
     </PageWrapper>
   </div>
@@ -183,7 +137,6 @@
 // import { genCode } from "@/api/system/autocode/rule";
 import ProogingBom from "./components/ProogingBom.vue";
 import ProogingProcess from "./components/ProogingProcess.vue";
-import ProogingSpecificationSheet from "./components/ProogingSpecificationSheet.vue";
 import ItemSelect from "@/components/itemSelect/single.vue";
 import RoutesProcessSelect from "@/components/routesProcessSelect/index.vue";
 import { listRouteprocess } from "@/api/mes/pro/routeprocess";
@@ -201,8 +154,7 @@ export default {
     ProogingBom,
     ProogingProcess,
     ItemSelect,
-    RoutesProcessSelect,
-    ProogingSpecificationSheet,
+    RoutesProcessSelect
   },
   dicts: ["production_solution_type", "production_solution_usage"],
   provide() {
@@ -265,6 +217,7 @@ export default {
       return titles[this.mode];
     },
   },
+  
   created() {
     if (this.$route.query && this.$route.query.productionSolutionId && this.productionSolutionId !== this.$route.query.productionSolutionId) {
       this.productionSolutionId = this.$route.query.productionSolutionId
@@ -292,8 +245,6 @@ export default {
             this.$refs["ProogingBomRef"].form2 = data.bomHead;
             this.$refs["ProogingBomRef"].tableData = data.bomHead.bomItemList;
             this.$refs["ProogingProcessRef"].tableData = data.processList;
-            this.$refs["ProogingSpecificationSheetRef"].form =
-              data.specificationSheet;
           })
           .finally(() => {
             this.loading = false;
@@ -332,13 +283,10 @@ export default {
     saveForm() {
       const bomHead = this.$refs.ProogingBomRef.getComData();
       const processList = this.$refs.ProogingProcessRef.getComData();
-      const specificationSheet =
-        this.$refs.ProogingSpecificationSheetRef.getComData();
       const params = {
         ...this.form,
         bomHead,
-        processList,
-        specificationSheet,
+        processList
       };
       this.loading = true;
       if (this.mode == "apply") {
@@ -398,7 +346,6 @@ export default {
       };
       this.$refs["ProogingBomRef"].resetState();
       this.$refs["ProogingProcessRef"].resetState();
-      this.$refs["ProogingSpecificationSheetRef"].resetState();
     },
   },
 };

src/views/mes/pro/scheduleList/index.vue

@@ -73,22 +73,6 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="编排单号" prop="arrangeCode">
-            <el-input
-              v-model="queryParams.arrangeCode"
-              placeholder="请输入编排单号"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="编排人员" prop="arrangeUsername">
-            <el-input
-              v-model="queryParams.arrangeUsername"
-              placeholder="请输入编排人员"
-              clearable
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
           <el-form-item label="工单编码" prop="workorderCode">
             <el-input
               v-model="queryParams.workorderCode"
@@ -157,17 +141,7 @@
 
     <el-table v-loading="loading" :data="maintenanceList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编排单号" width="120" prop="arrangeCode">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            @click="taskWorkunitId= scope.row.taskWorkunitId, isOrder = false, arrangCodeVisible = true"
-            >{{ scope.row.arrangeCode }}</el-button
-          >
-        </template>
-      </el-table-column>
-       <el-table-column label="任务单编码" width="120" prop="taskCode">
+      <el-table-column label="任务单编码" width="120" prop="taskCode">
         <template slot-scope="scope">
           <el-button
             size="mini"

src/views/mes/pro/workorder/indexApply.vue

@@ -116,54 +116,11 @@
           v-hasPermi="['mes:pro:workorder:edit']">导入
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleToolNumCheck"
-          v-hasPermi="['mes:pro:workorder:dofinish']">刀模版具齐套检查
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleCombination"
-          v-hasPermi="['pro:combination:add']">订单组合
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-edit" size="mini" @click="()=>handleCombination('del')"
-          >取消组合
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="multiple" @click="handleArrange"
-          v-hasPermi="['mes:pro:workorder:dofinish']">生产编排
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-edit" size="mini" @click="()=>handleArrange('del')"
-          >取消编排
-        </el-button>
-      </el-col>
       <el-col :span="1.5">
         <el-button type="success" plain icon="el-icon-edit" size="mini" :disabled="single" @click="handleMake"
           v-hasPermi="['mes:pro:workorder:make']">生产补单
         </el-button>
       </el-col>
-
-      <el-col :span="1.5">
-        <!-- <el-button
-          type="warning"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDofinish"
-          v-hasPermi="['mes:pro:workorder:dofinish']"
-        >生成任务单
-        </el-button> -->
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="warning" plain icon="el-icon-plus" size="mini" :disabled="single" @click="handleCommandClick"
-          v-hasPermi="['mes:pro:workorder:dofinish']">生产打样下达
-        </el-button>
-      </el-col>
       <el-col :span="1.2">
         <el-button type="warning" plain size="mini" v-print="printContent" id="printbtn" style="display: none"
           >打印工单
@@ -235,20 +192,6 @@
           <dict-tag :options="dict.type.mes_workorder_type" :value="scope.row.workorderType" />
         </template>
       </el-table-column>
-      <el-table-column label="组合单号" width="180" align="center" prop="combinationCode" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="showCombDetail(scope.row, scope.row.combinationCode)">{{
-            scope.row.combinationCode }}
-          </el-button>
-        </template>
-      </el-table-column>
-      <el-table-column label="编排单号" width="100px" align="center" prop="arrangeCode" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <el-button size="mini" type="text" @click="showArrangDetail(scope.row, scope.row.arrangeCode)">{{
-            scope.row.arrangeCode }}
-          </el-button>
-        </template>
-      </el-table-column>
       <el-table-column label="订单编号" width="140" align="center" prop="salesVoucher" />
       <el-table-column label="产品分类" width="200" align="center" prop="itemTypeName" :show-overflow-tooltip="true" />
       <el-table-column label="产品编号" width="120" align="center" prop="sapItemCode" />

src/views/mes/pro/workorder/proofingInfo.vue

@@ -191,31 +191,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="派工倍数" :disabled="mode == 'make'" prop="dispatchMultiple">
-              <el-input
-                v-model="form.dispatchMultiple"
-                :disabled="mode == 'make'"
-                placeholder="请输入派工倍数"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="排班行数" prop="rowNum">
-              <el-input v-model="form.rowNum" :disabled="mode == 'make'" placeholder="请输入排版行数" />
-            </el-form-item>
-          </el-col>
-
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="单重" prop="singleWeight">
-              <el-input v-model="form.singleWeight" :disabled="mode == 'make'" placeholder="请输入单重" />
-            </el-form-item>
-          </el-col>
-          <el-col :lg="6" :md="8" :sm="12" :xs="12">
-            <el-form-item label="厚度(丝)" prop="thickness">
-              <el-input v-model="form.thickness" :disabled="mode == 'make'" placeholder="请输入厚度(丝)" />
-            </el-form-item>
-          </el-col>
           <el-col :lg="6" :md="8" :sm="12" :xs="12">
             <el-form-item label="开始序列码" prop="startSerial">
               <el-input v-model="form.startSerial" :disabled="mode == 'make'" placeholder="请输入开始序列码" />