2025-08-15 物料档案管理

src/api/qc/qc.js

@@ -230,3 +230,5 @@ export const deleteObjectFile= data => createAPI(`/pms/qc/deleteObjectFile`,'pos
 export const getUserRoleList= data => createAPI(`/pms/qc/getUserRoleList`,'post',data)
 export const getOperatorList = data => createAPI(`/pms/qc/getOperatorList`,'post',data)
 
+export const getCustomerList = data => createAPI(`/pms/qc/getCustomerList`,'post',data)
+

src/views/modules/qc/qcPartAttribute.vue

@@ -169,45 +169,41 @@
           <div class="form-section">
             <div class="section-title">仓库配置</div>
             <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item label="超入比例">
+              <el-col :span="4">
+                <el-form-item label="超入比例%">
                   <el-input-number :controls="false" :step="0" v-model="modalData.exceedInRatio" :disabled="modalDisableFlag" style="width: 100%"></el-input-number>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
-                <el-form-item label="超领比例">
-                  <el-input-number :controls="false" :step="0" v-model="modalData.exceedOutRatio" :disabled="modalDisableFlag" style="width: 100%"></el-input-number>
+              <el-col :span="10">
+                <el-form-item>
+                  <span v-if="modalDisableFlag" slot="label">入库默认仓库</span>
+                  <span v-else style="cursor: pointer" slot="label" @click="getBaseList(20, 1)"><a href="#">入库默认仓库</a></span>
+                  <el-input v-model="modalData.inboundWarehouseId" :disabled="modalDisableFlag" @change="inWarehouseBlur(20)" style="width: 25%"></el-input>
+                  <el-input v-model="modalData.inboundWarehouseName" disabled style="width: 70%"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="10">
+                <el-form-item>
+                  <span v-if="modalDisableFlag" slot="label">入库默认库位</span>
+                  <span v-else style="cursor: pointer" slot="label" @click="getBaseList(22)"><a href="#">入库默认库位</a></span>
+                  <el-input v-model="modalData.inboundLocationId" :disabled="modalDisableFlag" @change="locationBlur(22)" style="width: 25%"></el-input>
+                  <el-input v-model="modalData.inboundLocationName" disabled style="width: 70%"></el-input>
                 </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="20">
-              <el-col :span="8">
-                <el-form-item>
-                  <span v-if="modalDisableFlag" slot="label">入库默认仓库</span>
-                  <span v-else style="cursor: pointer" slot="label" @click="getBaseList(20, 1)"><a href="#">入库默认仓库</a></span>
-                  <el-input-group>
-                    <el-input v-model="modalData.inboundWarehouseId" :disabled="modalDisableFlag" @change="inWarehouseBlur(20)" style="width: 25%"></el-input>
-                    <el-input v-model="modalData.inboundWarehouseName" disabled style="width: 75%"></el-input>
-                  </el-input-group>
+              <el-col :span="4">
+                <el-form-item label="超领比例%">
+                  <el-input-number :controls="false" :step="0" v-model="modalData.exceedOutRatio" :disabled="modalDisableFlag" style="width: 100%"></el-input-number>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="10">
                 <el-form-item>
                   <span v-if="modalDisableFlag" slot="label">领料默认仓库</span>
                   <span v-else style="cursor: pointer" slot="label" @click="getBaseList(20, 2)"><a href="#">领料默认仓库</a></span>
                   <el-input-group>
                     <el-input v-model="modalData.outboundWarehouseId" :disabled="modalDisableFlag" @change="outWarehouseBlur(20)" style="width: 25%"></el-input>
-                    <el-input v-model="modalData.outboundWarehouseName" disabled style="width: 75%"></el-input>
-                  </el-input-group>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8">
-                <el-form-item>
-                  <span v-if="modalDisableFlag" slot="label">默认库位</span>
-                  <span v-else style="cursor: pointer" slot="label" @click="getBaseList(22)"><a href="#">默认库位</a></span>
-                  <el-input-group>
-                    <el-input v-model="modalData.inboundLocationId" :disabled="modalDisableFlag" @change="locationBlur(22)" style="width: 25%"></el-input>
-                    <el-input v-model="modalData.inboundLocationName" disabled style="width: 75%"></el-input>
+                    <el-input v-model="modalData.outboundWarehouseName" disabled style="width: 70%"></el-input>
                   </el-input-group>
                 </el-form-item>
               </el-col>
@@ -607,7 +603,7 @@
             <el-input v-model="detailData.templateName" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item label="检验类型">
-            <el-select v-model="detailData.inspectionTypeNo" @change="checkInspectionType()" placeholder="请选择">
+            <el-select v-model="detailData.inspectionTypeNo" @change="checkInspectionType" placeholder="请选择">
               <el-option
                 v-for = "i in options"
                 :key = "i.inspectionTypeNo"
@@ -617,123 +613,224 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="checkInspectionType()">查询</el-button>
+            <el-button type="primary" @click="checkInspectionType2">查询</el-button>
           </el-form-item>
-          <el-form-item style="margin-left: 117px" :label="' '">
-            <el-button type="primary" @click="getOperationList()" style="width: 63px" v-if="this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107'">工序</el-button>
-            <el-button type="primary" @click="getManufacturerList()" v-if="this.detailData.inspectionTypeNo === '105'" style="width: 63px">供应商</el-button>
+          <el-form-item :label="' '" style="margin-left: 63px">
+            <el-button type="primary" @click="getOperationList" v-if="this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107'" style="width: 63px" >工序</el-button>
+            <el-button type="primary" @click="getManufacturerList" v-if="this.detailData.inspectionTypeNo === '105'" style="width: 63px">供应商</el-button>
+            <el-button type="primary" @click="getCustomerList" v-if="this.detailData.inspectionTypeNo === '109'" style="width: 63px">客户</el-button>
           </el-form-item>
-          <el-form-item :label="' '">
-            <el-button type="primary" @click="getAllResourceList()" style="width: 63px" v-if="this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107'">机台</el-button>
+          <el-form-item :label="' '" style="margin-left: 195px">
+            <el-button type="primary" @click="getAllResourceList" v-if="this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107'" style="width: 63px">机台</el-button>
           </el-form-item>
         </el-form>
       </div>
-      <el-container style="margin-top: 0px;">
-        <el-main style="width: 470px;padding: 1px">
-          <span style="font-size: 12px" >可选模板：</span>
-          <el-table
-            height="400px"
-            :data="itemList1"
-            border
-            ref="itemTable1"
-            @row-click="itemClickRow1"
-            @selection-change="selectionItem1"
-            highlight-current-row
-            style="width: 100%">
-            <el-table-column
-              type="selection"
-              header-align="center"
-              align="center"
-              width="50">
-            </el-table-column>
-            <el-table-column
-              prop="templateId"
-              header-align="center"
-              align="center"
-              min-width="80"
-              label="模板编码">
-            </el-table-column>
-            <el-table-column
-              prop="templateName"
-              header-align="center"
-              align="center"
-              min-width="170"
-              label="模板名称">
-            </el-table-column>
-            <el-table-column
-              prop="inspectionTypeName"
-              header-align="center"
-              align="center"
-              min-width="80"
-              label="检验类型">
-            </el-table-column>
-          </el-table>
-        </el-main>
-        <el-main style="width: 100px;padding: 1px">
-          <div style="margin-top: 180px;margin-left: 18px">
-            <el-button type="primary" @click="addItem()">添加>></el-button>
-          </div>
-          <div style="margin-top: 15px;margin-left: 18px">
-            <el-button type="primary" @click="deleteItem()">删除<<</el-button>
+      <el-container>
+        <el-header style="width: 1080px;height: 200px;padding: 0 0 0 0">
+          <el-row :gutter="5">
+            <el-col :span="span1">
+              <span style="font-size: 12px" >可选模板:</span>
+              <el-table
+                height="210px"
+                :data="itemList1"
+                border
+                ref="itemTable1"
+                @row-click="itemClickRow1"
+                @selection-change="selectionItem1"
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column
+                  type="selection"
+                  header-align="center"
+                  align="center"
+                  width="50">
+                </el-table-column>
+                <el-table-column
+                  prop="templateId"
+                  header-align="center"
+                  align="center"
+                  min-width="80"
+                  label="模板编码">
+                </el-table-column>
+                <el-table-column
+                  prop="templateName"
+                  header-align="center"
+                  align="left"
+                  min-width="200"
+                  label="模板名称">
+                </el-table-column>
+                <el-table-column
+                  prop="inspectionTypeName"
+                  header-align="center"
+                  align="center"
+                  min-width="60"
+                  label="检验类型">
+                </el-table-column>
+              </el-table>
+            </el-col>
+            <el-col v-if="detailData.inspectionTypeNo === '105' || detailData.inspectionTypeNo === '101' || detailData.inspectionTypeNo === '109' || detailData.inspectionTypeNo === '107'" :span="span2" style="margin-top: 25px">
+              <el-table
+                v-if="detailData.inspectionTypeNo === '105'"
+                height="210px"
+                :data="selectionManufacturer2"
+                border
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column
+                  prop="manufacturerID"
+                  header-align="center"
+                  align="center"
+                  min-width="100"
+                  label="供应商编码">
+                </el-table-column>
+                <el-table-column
+                  prop="manufacturerName"
+                  header-align="center"
+                  align="left"
+                  min-width="150"
+                  label="供应商名称">
+                </el-table-column>
+              </el-table>
+              <el-table
+                v-else-if="detailData.inspectionTypeNo === '109'"
+                height="210px"
+                :data="selectionCustomer2"
+                border
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column
+                  prop="customerID"
+                  header-align="center"
+                  align="center"
+                  min-width="100"
+                  label="客户编码">
+                </el-table-column>
+                <el-table-column
+                  prop="customerName"
+                  header-align="center"
+                  align="left"
+                  min-width="150"
+                  label="客户名称">
+                </el-table-column>
+              </el-table>
+              <el-table
+                v-else
+                height="210px"
+                :data="operationSelections"
+                border
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column
+                  prop="operationDesc"
+                  header-align="center"
+                  align="center"
+                  label="工序">
+                </el-table-column>
+              </el-table>
+            </el-col>
+            <el-col v-if="detailData.inspectionTypeNo === '101' || detailData.inspectionTypeNo === '107'" :span="span3" style="margin-top: 25px">
+              <el-table
+                height="210px"
+                :data="resourceSelections"
+                border
+                highlight-current-row
+                style="width: 100%">
+                <el-table-column
+                  prop="resourceId"
+                  header-align="center"
+                  align="center"
+                  min-width="100"
+                  label="机台编码">
+                </el-table-column>
+                <el-table-column
+                  prop="resourceDesc"
+                  header-align="center"
+                  align="left"
+                  min-width="150"
+                  label="机台名称">
+                </el-table-column>
+              </el-table>
+            </el-col>
+          </el-row>
+        </el-header>
+        <el-main style="width: 880px;height: 25px;margin-top: 50px;padding: 0 0 0 0;text-align:center">
+          <div>
+            <el-button type="primary" @click="addItem">添加<i class="el-icon-caret-bottom el-icon--right"></i></el-button>
+            <el-button type="primary" @click="deleteItem">删除<i class="el-icon-caret-top el-icon--right"></i></el-button>
           </div>
         </el-main>
-        <el-main style="width: 470px;padding: 1px">
-          <span style="font-size: 12px">已有模板：</span>
-          <el-table
-            height="400px"
-            :data="itemList2"
-            border
-            ref="itemTable2"
-            @row-click="itemClickRow2"
-            @selection-change="selectionItem2"
-            highlight-current-row
-            style="width: 100%">
-            <el-table-column
-              type="selection"
-              header-align="center"
-              align="center"
-              width="50">
-            </el-table-column>
-            <el-table-column
-              prop="templateId"
-              header-align="center"
-              align="center"
-              label="模板编码">
-            </el-table-column>
-            <el-table-column
-              prop="templateName"
-              header-align="center"
-              align="center"
-              label="模板名称">
-            </el-table-column>
-            <el-table-column
-              prop="operation"
-              header-align="center"
-              align="center"
-              label="工序">
-            </el-table-column>
-            <el-table-column
-              prop="resourceID"
-              header-align="center"
-              align="center"
-              label="机台">
-            </el-table-column>
-            <el-table-column
-              prop="manufacturerName"
-              header-align="center"
-              align="center"
-              label="供应商">
-            </el-table-column>
-            <el-table-column
-              prop="inspectionTypeName"
-              header-align="center"
-              align="center"
-              label="检验类型">
-            </el-table-column>
-          </el-table>
-        </el-main>
+        <el-footer style="width: 1080px;height: 222px;padding: 0 0 0 0;margin-top: -4px">
+          <span style="font-size: 12px" >已有模板:</span>
+          <div class="rq">
+            <el-table
+              height="200px"
+              :data="itemList2"
+              border
+              ref="itemTable2"
+              @row-click="itemClickRow2"
+              @selection-change="selectionItem2"
+              highlight-current-row
+              style="width: 100%">
+              <el-table-column
+                type="selection"
+                header-align="center"
+                align="center"
+                width="50">
+              </el-table-column>
+              <el-table-column
+                prop="templateId"
+                header-align="center"
+                align="center"
+                min-width="80"
+                label="模板编码">
+              </el-table-column>
+              <el-table-column
+                prop="templateName"
+                header-align="center"
+                align="center"
+                min-width="200"
+                label="模板名称">
+              </el-table-column>
+              <el-table-column
+                prop="operation"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="工序">
+              </el-table-column>
+              <el-table-column
+                prop="resourceID"
+                header-align="center"
+                align="center"
+                min-width="100"
+                label="机台">
+              </el-table-column>
+              <el-table-column
+                prop="manufacturerName"
+                header-align="center"
+                align="center"
+                min-width="200"
+                label="供应商">
+              </el-table-column>
+              <el-table-column
+                prop="customerName"
+                header-align="center"
+                align="center"
+                min-width="200"
+                label="客户">
+              </el-table-column>
+              <el-table-column
+                prop="inspectionTypeName"
+                header-align="center"
+                align="center"
+                min-width="60"
+                label="检验类型">
+              </el-table-column>
+            </el-table>
+          </div>
+        </el-footer>
       </el-container>
-      <el-footer  style="height:35px;margin-top: 15px;text-align:center">
+      <el-footer  style="height:35px;margin-top: 18px;text-align:center">
         <el-button type="primary" @click="fastAddFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
@@ -746,22 +843,24 @@
             <el-input v-model="operationData.operationDesc" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="getOperationList2()">查询</el-button>
+            <el-button type="primary" @click="getOperationList2">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table
           :height="300"
           :data="operationList"
           ref="operationTable"
-          @row-click="operationClickRow"
           @selection-change="selectionOperationChangeHandle"
+          @select="operationSelect"
+          :row-key="getRowKeys"
           border
-          :row-class-name="operationRowClassName"
           style="width: 100%;">
-          <el-table-column type="index" width="50" align="center">
-            <template slot-scope="scope">
-              <el-radio v-model="operationCurrent" :label="scope.row.index">{{''}}</el-radio>
-            </template>
+          <el-table-column
+            type="selection"
+            header-align="center"
+            align="center"
+            :reserve-selection="true"
+            width="50">
           </el-table-column>
           <el-table-column
             prop="operationDesc"
@@ -771,8 +870,8 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-footer style="height:35px;margin-top: 15px;text-align:center">
-        <el-button type="primary" @click="confirmOperation()">确认</el-button>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="confirmOperation">确认</el-button>
       </el-footer>
     </el-dialog>
 
@@ -787,22 +886,24 @@
             <el-input v-model="resourceData.resourceDesc" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="getAllResourceList2()">查询</el-button>
+            <el-button type="primary" @click="getAllResourceList2">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table
           :height="300"
           :data="resourceList"
           ref="resourceTable"
-          @row-click="resourceClickRow"
           @selection-change="selectionResourceChangeHandle"
+          @select="resourceSelect"
+          :row-key="getRowKeys2"
           border
-          :row-class-name="resourceRowClassName"
           style="width: 100%;">
-          <el-table-column type="index" width="50" align="center">
-            <template slot-scope="scope">
-              <el-radio v-model="resourceCurrent" :label="scope.row.index">{{''}}</el-radio>
-            </template>
+          <el-table-column
+            type="selection"
+            header-align="center"
+            align="center"
+            :reserve-selection="true"
+            width="50">
           </el-table-column>
           <el-table-column
             prop="resourceId"
@@ -818,8 +919,8 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-footer style="height:35px;margin-top: 15px;text-align:center">
-        <el-button type="primary" @click="confirmResource()">确认</el-button>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="confirmResource">确认</el-button>
       </el-footer>
     </el-dialog>
 
@@ -834,7 +935,7 @@
             <el-input v-model="manufacturerData.manufacturerName" clearable style="width: 120px"></el-input>
           </el-form-item>
           <el-form-item :label="' '">
-            <el-button type="primary" @click="getManufacturerList()">查询</el-button>
+            <el-button type="primary" @click="getManufacturerList2">查询</el-button>
           </el-form-item>
         </el-form>
         <el-table
@@ -843,12 +944,14 @@
           ref="manufacturerTable"
           @row-click="manufacturerClickRow"
           @selection-change="selectionManufacturerChangeHandle"
+          :row-key="getRowKeys3"
           border
           style="width: 100%;">
           <el-table-column
             type="selection"
             header-align="center"
             align="center"
+            :reserve-selection="true"
             width="50">
           </el-table-column>
           <el-table-column
@@ -865,12 +968,62 @@
           </el-table-column>
         </el-table>
       </div>
-      <el-footer style="height:35px;margin-top: 15px;text-align:center">
-        <el-button type="primary" @click="confirmManufacturer()">确认</el-button>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="confirmManufacturer">确认</el-button>
         <el-button type="primary" @click="manufacturerModelFlag = false">关闭</el-button>
       </el-footer>
     </el-dialog>
 
+    <!-- 客户 -->
+    <el-dialog title="客户清单" :close-on-click-modal="false" v-drag :visible.sync="customerModelFlag" width="520px">
+      <div class="rq">
+        <el-form :inline="true" label-position="top" :model="customerData">
+          <el-form-item :label="'客户编码:'">
+            <el-input v-model="customerData.customerID" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="'客户名称:'">
+            <el-input v-model="customerData.customerName" clearable style="width: 120px"></el-input>
+          </el-form-item>
+          <el-form-item :label="' '">
+            <el-button type="primary" @click="getCustomerList2">查询</el-button>
+          </el-form-item>
+        </el-form>
+        <el-table
+          :height="300"
+          :data="customerList"
+          ref="customerTable"
+          @row-click="customerClickRow"
+          @selection-change="selectionCustomerChangeHandle"
+          :row-key="getRowKeys4"
+          border
+          style="width: 100%;">
+          <el-table-column
+            type="selection"
+            header-align="center"
+            align="center"
+            :reserve-selection="true"
+            width="50">
+          </el-table-column>
+          <el-table-column
+            prop="customerID"
+            header-align="center"
+            align="center"
+            label="客户编码">
+          </el-table-column>
+          <el-table-column
+            prop="customerName"
+            header-align="center"
+            align="center"
+            label="客户名称">
+          </el-table-column>
+        </el-table>
+      </div>
+      <el-footer style="height:40px;margin-top: 20px;text-align:center">
+        <el-button type="primary" @click="confirmCustomer">确认</el-button>
+        <el-button type="primary" @click="customerModelFlag = false">关闭</el-button>
+      </el-footer>
+    </el-dialog>
+
     <!-- sop文件清单 -->
     <el-dialog title="SOP文件清单" :close-on-click-modal="false" v-drag :visible.sync="sopFileModelFlag" width="800px">
       <el-form :inline="true" label-position="top" style="margin-left: 7px;margin-top: -5px;">
@@ -1012,6 +1165,7 @@
     saveLabelTemplate, // 新增标签模版设置
     deleteLabelTemplate, // 删除标签模版设置
     updateLabelTemplate, // 编辑标签模版设置
+    getCustomerList, // 查询客户列表
   } from "@/api/qc/qc.js"
   import {getTableDefaultListLanguage, getTableUserListLanguage} from "@/api/table.js"
   import Chooselist from '@/views/modules/common/Chooselist_eam'
@@ -1680,6 +1834,7 @@
         operation: '',
         resourceId: '',
         selectionManufacturer: [],
+        selectionManufacturer2: [],
         // 供应商
         manufacturerList: [],
         manufacturerModelFlag: false,
@@ -1778,7 +1933,22 @@
         defectTrackingModal: false,
         defectTrackingDisableFlag: false,
         labelTemplateModal: false,
-        labelTemplateDisableFlag: false
+        labelTemplateDisableFlag: false,
+        selectionCustomer: [],
+        selectionCustomer2: [],
+        dataListCustomerSelections: [],
+        span1: 12,
+        span2: 12,
+        span3: 12,
+        operationSelections: [],
+        resourceSelections: [],
+        customerData: {
+          site: '',
+          customerID: '',
+          customerName: ''
+        },
+        customerModelFlag: false,
+        customerList: [],
       }
     },
 
@@ -2045,8 +2215,23 @@
 
       checkInspectionType () {
         getPartTemplateLists(this.detailData).then(({data}) => {
-          this.operation = ''
-          this.resourceId = ''
+          this.itemList1 = data.row1
+          this.itemList2 = data.row2
+        })
+        if (this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '107') {
+          this.span1 = 12
+          this.span2 = 6
+          this.span3 = 6
+        } else if (this.detailData.inspectionTypeNo === '105' || this.detailData.inspectionTypeNo === '109') {
+          this.span1 = 12
+          this.span2 = 12
+        } else {
+          this.span1 = 24
+        }
+      },
+
+      checkInspectionType2 () {
+        getPartTemplateLists(this.detailData).then(({data}) => {
           this.itemList1 = data.row1
           this.itemList2 = data.row2
         })
@@ -2090,15 +2275,15 @@
         this.detailData.inspectionTypeNo = this.options[0].inspectionTypeNo
         this.checkInspectionType()
         this.dataListOperationSelections = []
-        this.operation = ''
-        this.resourceId = ''
         this.operationData.operationDesc = ''
         this.resourceData.resourceId = ''
         this.resourceData.resourceDesc = ''
-        this.operationCurrent = -1
-        this.resourceCurrent = -1
         this.selectionManufacturer = []
+        this.selectionManufacturer2 = []
         this.dataListManufacturerSelections = []
+        this.selectionCustomer = []
+        this.selectionCustomer2 = []
+        this.dataListCustomerSelections = []
         this.fastAddFlag = true
       },
 
@@ -2126,11 +2311,11 @@
           this.$message.warning('请选择可选模板！')
           return
         }
-        if ((this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107') && (this.operation == null || this.operation === '')) {
+        if ((this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107') && (this.operationSelections.length === 0)) {
           this.$message.warning('请选择工序！')
           return
         }
-        if ((this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107') && (this.resourceId == null || this.resourceId === '')) {
+        if ((this.detailData.inspectionTypeNo === '101' || this.detailData.inspectionTypeNo === '102' || this.detailData.inspectionTypeNo === '103' || this.detailData.inspectionTypeNo === '104' || this.detailData.inspectionTypeNo === '106' || this.detailData.inspectionTypeNo === '107') && (this.resourceSelections.length === 0)) {
           this.$message.warning('请选择机台！')
           return
         }
@@ -2143,9 +2328,10 @@
           buNo: this.detailData.buNo,
           attributeNo: this.detailData.partNo,
           itemList: this.itemSelections1,
-          operation: this.operation,
-          resourceID: this.resourceId,
+          operation: this.operationSelections.length === 0 ? '' : this.operationSelections[0].operationDesc,
+          resourceID: this.resourceSelections.length === 0 ? '' : this.resourceSelections[0].resourceId,
           manufacturerList: this.selectionManufacturer,
+          customerList: this.selectionCustomer,
           attributeType: this.detailData.attributeType,
           inspectionTypeNo: this.detailData.inspectionTypeNo
         }
@@ -2156,9 +2342,10 @@
               this.itemList2 = data.row2
             })
             this.itemSelections1 = []
-            this.operation = ''
-            this.resourceId = ''
             this.selectionManufacturer = []
+            this.selectionManufacturer2 = []
+            this.selectionCustomer = []
+            this.selectionCustomer2 = []
           } else {
             this.$message.error(data.msg)
           }
@@ -2207,7 +2394,9 @@
         }).then(() => {
           deletePartAttributeDetails(row).then(({data}) => {
             if (data && data.code === 0) {
-              this.detailModal()
+              searchPartAttributeDetails(this.detailData).then(({data}) => {
+                this.detailList = data.rows
+              })
               this.$message.success('操作成功')
             } else {
               this.$message.error(data.msg)
@@ -2685,18 +2874,30 @@
 
       // 多选工序
       selectionOperationChangeHandle (val) {
-        this.operation = val[0].operationDesc
-        if (val) {
-          this.operationCurrent = val.index
-        }
+        this.operationSelections = val
+      },
+
+      operationSelect (selection, row) {
+        this.$refs.operationTable.clearSelection()
+        this.$refs.operationTable.toggleRowSelection(row, true)
+      },
+
+      getRowKeys (row) {
+        return row.operationDesc
       },
 
       // 多选机台
       selectionResourceChangeHandle (val) {
-        this.resourceId = val[0].resourceId
-        if (val) {
-          this.resourceCurrent = val.index
-        }
+        this.resourceSelections = val
+      },
+
+      resourceSelect (selection, row) {
+        this.$refs.resourceTable.clearSelection()
+        this.$refs.resourceTable.toggleRowSelection(row, true)
+      },
+
+      getRowKeys2 (row) {
+        return row.resourceId
       },
 
       operationRowClassName ({row, rowIndex}) {
@@ -2741,6 +2942,30 @@
         })
       },
 
+      // 获取供应商列表
+      getManufacturerList2 () {
+        this.manufacturerData.site = this.detailData.site
+        getManufacturerList(this.manufacturerData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.manufacturerList = data.rows
+            //拿到选中的供应商
+            let tempDataList = this.selectionManufacturer
+            this.manufacturerList.forEach(val => {
+              // 回显选中的供应商
+              if (tempDataList.includes(val.manufacturerID)) {
+                this.$nextTick(() => this.$refs.manufacturerTable.toggleRowSelection(val, true))
+              }
+            })
+          } else {
+            this.manufacturerList = []
+          }
+        })
+      },
+
+      getRowKeys3 (row) {
+        return row.manufacturerID
+      },
+
       // 点击行选中复选框
       manufacturerClickRow (row) {
         this.$refs.manufacturerTable.toggleRowSelection(row)
@@ -2754,12 +2979,82 @@
       // 确认多选供应商
       confirmManufacturer () {
         this.selectionManufacturer = []
+        this.selectionManufacturer2 = []
         for (let i = 0; i < this.dataListManufacturerSelections.length; i++) {
           this.selectionManufacturer.push(this.dataListManufacturerSelections[i].manufacturerID)
+          this.selectionManufacturer2.push(this.dataListManufacturerSelections[i])
         }
         this.manufacturerModelFlag = false
       },
 
+      // 获取客户列表
+      getCustomerList () {
+        this.customerData.site = this.detailData.site
+        getCustomerList(this.customerData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.customerList = data.rows
+            // 先清空缓存选中
+            this.$nextTick(() => this.$refs.customerTable.clearSelection())
+            // 拿到选中的客户
+            let tempDataList = this.selectionCustomer
+            this.customerList.forEach(val => {
+              // 回显选中的客户
+              if (tempDataList.includes(val.customerID)) {
+                this.$nextTick(() => this.$refs.customerTable.toggleRowSelection(val, true))
+              }
+            })
+            this.customerModelFlag = true
+          } else {
+            this.$message.error(data.msg)
+          }
+        })
+      },
+
+      // 获取客户列表
+      getCustomerList2 () {
+        this.customerData.site = this.detailData.site
+        getCustomerList(this.customerData).then(({data}) => {
+          if (data && data.code === 0) {
+            this.customerList = data.rows
+            //拿到选中的客户
+            let tempDataList = this.selectionCustomer
+            this.manufacturerList.forEach(val => {
+              // 回显选中的客户
+              if (tempDataList.includes(val.customerID)) {
+                this.$nextTick(() => this.$refs.customerTable.toggleRowSelection(val, true))
+              }
+            })
+          } else {
+            this.customerList = []
+          }
+        })
+      },
+
+      // 点击行选中复选框
+      customerClickRow (row) {
+        this.$refs.customerTable.toggleRowSelection(row)
+      },
+
+      // 多选客户
+      selectionCustomerChangeHandle (val) {
+        this.dataListCustomerSelections = val
+      },
+
+      getRowKeys4 (row) {
+        return row.customerID
+      },
+
+      // 确认多选客户
+      confirmCustomer () {
+        this.selectionCustomer = []
+        this.selectionCustomer2 = []
+        for (let i = 0; i < this.dataListCustomerSelections.length; i++) {
+          this.selectionCustomer.push(this.dataListCustomerSelections[i].customerID)
+          this.selectionCustomer2.push(this.dataListCustomerSelections[i])
+        }
+        this.customerModelFlag = false
+      },
+
       // sop文件列表
       sopFileList (row) {
         this.sopData = {