质检计划对接采购收货单

src/api/inspectionPlan/index.js

@@ -36,10 +36,24 @@ export async function planIssued(data) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+// 采购收货单 
 
+export async function purchaseorderreceive (params) {
+  const res = await request.get(`/eom/purchaseorderreceive/page`, { params });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
+// 采购收货单 详情
 
-
-
+export async function purchaseorderreceiveGetById (id) {
+  const res = await request.get(`/eom/purchaseorderreceive/getById/`+id, {  });
+  if (res.data.code == 0) {
+    return res.data.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}
 
 // 删除
 export async function removeItem(data) {

src/views/inspectionPlan/components/edit.vue

@@ -94,11 +94,11 @@
             </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="8">
+        <!-- <el-col :span="8">
           <el-form-item label="批号:" prop="batchNo">
             <el-input v-model="form.batchNo" disabled />
           </el-form-item>
-        </el-col>
+        </el-col> -->
         <!-- <el-col :span="8">
           <el-form-item label="产品名称:" prop="productName">
             <el-input
@@ -207,18 +207,19 @@
               module="main"
               :showLib="false"
               :limit="1"
-              :disabled="type=='detail'"
-
+              :disabled="type == 'detail'"
             />
           </el-form-item>
         </el-col>
       </el-row>
       <el-table :data="form.productList" border height="30vh">
-        <el-table-column label="产品编码" align="center" prop="productCode">
+        <el-table-column label="批次号" align="center" prop="batchNo">
         </el-table-column>
-        <el-table-column label="产品名称" align="center" prop="productName">
+        <el-table-column label="编码" align="center" prop="productCode">
         </el-table-column>
-
+        <el-table-column label="名称" align="center" prop="productName">
+        </el-table-column>
+    
         <el-table-column label="规格" align="center" prop="specification">
         </el-table-column>
         <el-table-column label="牌号" align="center" prop="brandNo">
@@ -248,10 +249,15 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="add-product" @click="addProduct"   v-if="type!='detail'">
+      <div class="add-product" @click="addProduct" v-if="type != 'detail'">
         <i class="el-icon-circle-plus-outline"></i>
       </div>
-      <EquipmentDialog ref="equipmentRefs" @choose="choose" :type="1" />
+      <EquipmentDialog
+        ref="equipmentRefs"
+        @choose="choose"
+        :type="1"
+        :isAll="true"
+      />
       <productionPlan ref="productionPlanRef" @choose="choose" />
       <workOrder ref="workOrderRef" @choose="choose" />
       <produceOrder ref="produceOrderRef" @choose="choose" />
@@ -353,12 +359,14 @@ export default {
     'form.type'(val) {
       this.sourceList =
         val == 1
-          ? [{ label: '入库申请单', value: '1' }]
-          :val == 2? [
+          ? [{ label: '采购收货单', value: '1' }]
+          : val == 2
+          ? [
               { label: '生产计划', value: '2' },
               { label: '生产订单', value: '3' },
               { label: '生产工单', value: '4' }
-            ]:[]
+            ]
+          : [];
     }
   },
   created() {},
@@ -440,10 +448,10 @@ export default {
       });
     },
     choose(data) {
-      let arr = [];
       if (Array.isArray(data)) {
+        this.form.productList=[]
         data.forEach((item) => {
-          arr.push({
+          this.form.productList.push({
             productCode: item.code,
             productName: item.name,
             specification: item.specification,
@@ -451,24 +459,11 @@ export default {
             productNumber: ''
           });
         });
-      } else {
-        arr = data.productName
-          ? [
-              {
-                productCode: data.productCode,
-                productName: data.productName,
-                specification: data.model,
-                brandNo: data.brandNo,
-                productNumber: data.productNumber
-              }
-            ]
-          : [];
+        return
       }
-
+      this.form.productList=data.productList
       this.form.planSourceId = data.id;
       this.form.planSourceCode = data.code;
-      this.form.batchNo = data.batchNo;
-      this.form.productList = arr;
     },
 
     //选择部门(搜索)

src/views/inspectionPlan/components/produceOrder.vue

@@ -231,7 +231,17 @@ export default {
         this.type == 1
           ? JSON.parse(JSON.stringify(this.selection))
           : JSON.parse(JSON.stringify(this.current));
-      data['productNumber']=data.formingNum
+
+      data['productList'] = [
+        {
+          productCode: data.productCode,
+          productName: data.productName,
+          specification: data.model,
+          brandNo: data.brandNo,
+          productNumber: data.formingNum,
+          batchNo: data.batchNo,
+        }
+      ];
       this.$emit('choose', data);
       this.handleClose();
     }

src/views/inspectionPlan/components/productionPlan.vue

@@ -18,7 +18,6 @@
             :selection.sync="selection"
             :current.sync="current"
             highlight-current-row
-            
             row-key="id"
             height="50vh"
             @done="onDone"
@@ -35,15 +34,14 @@
 </template>
 
 <script>
-import { getPlanList} from '@/api/aps/index.js';
-
+import { getPlanList } from '@/api/aps/index.js';
 
 export default {
   components: {},
   props: {
     selectList: Array,
     type: {
-      default: 2//1多选 2单选
+      default: 2 //1多选 2单选
     }
   },
   data() {
@@ -63,7 +61,7 @@ export default {
           columnKey: 'selection',
           align: 'center',
           reserveSelection: true,
-          show:this.type==1
+          show: this.type == 1
         },
         {
           columnKey: 'index',
@@ -134,7 +132,7 @@ export default {
           prop: 'productWeight',
           label: '计划重量',
           align: 'center',
-          showOverflowTooltip: true,
+          showOverflowTooltip: true
         },
         {
           prop: 'requiredFormingNum',
@@ -147,10 +145,9 @@ export default {
           prop: 'newSumOrderWeight',
           label: '要求生产重量',
           align: 'center',
-          showOverflowTooltip: true,
+          showOverflowTooltip: true
         },
 
-      
         {
           prop: 'reqMoldTime',
           label: '要求生产日期',
@@ -159,7 +156,6 @@ export default {
           minWidth: 110
         },
 
-
         {
           prop: 'orderType',
           label: '计划类型',
@@ -176,12 +172,12 @@ export default {
           align: 'center',
           showOverflowTooltip: true,
           minWidth: 110
-        },
+        }
       ],
       categoryLevelId: null,
       code: null,
       selection: [],
-      ids:[]
+      ids: []
     };
   },
 
@@ -197,7 +193,7 @@ export default {
     open(ids) {
       this.equipmentdialog = true;
     },
-    onDone(){
+    onDone() {
       this.$nextTick(() => {
         this.$refs.equiTable.setSelectedRowKeys(this.ids);
       });
@@ -208,9 +204,20 @@ export default {
     },
     // 选择
     selected() {
-      let data=this.type==1?JSON.parse(JSON.stringify(this.selection)):JSON.parse(JSON.stringify(this.current))
-      data['productNumber']=data.productNum
-
+      let data =
+        this.type == 1
+          ? JSON.parse(JSON.stringify(this.selection))
+          : JSON.parse(JSON.stringify(this.current));
+      data['productList'] = [
+        {
+          productCode: data.productCode,
+          productName: data.productName,
+          specification: data.model,
+          batchNo: data.batchNo,
+          brandNo: data.brandNo,
+          productNumber: data.productNum
+        }
+      ];
       this.$emit('choose', data);
       this.handleClose();
     }

src/views/inspectionPlan/components/warehousing.vue

@@ -6,7 +6,7 @@
     :close-on-press-escape="false"
     append-to-body
     width="70%"
-    title="入库申请单"
+    title="采购收货单"
   >
     <div>
       <el-row>
@@ -18,7 +18,6 @@
             :selection.sync="selection"
             :current.sync="current"
             highlight-current-row
-            
             row-key="id"
             height="50vh"
             @done="onDone"
@@ -35,15 +34,17 @@
 </template>
 
 <script>
-import { warehousing} from '@/api/aps/index.js';
-
+import {
+  purchaseorderreceive,
+  purchaseorderreceiveGetById
+} from '@/api/inspectionPlan/index.js';
 
 export default {
   components: {},
   props: {
     selectList: Array,
     type: {
-      default: 2//1多选 2单选
+      default: 2 //1多选 2单选
     }
   },
   data() {
@@ -58,7 +59,7 @@ export default {
           columnKey: 'selection',
           align: 'center',
           reserveSelection: true,
-          show:this.type==1
+          show: this.type == 1
         },
         {
           columnKey: 'index',
@@ -66,102 +67,67 @@ export default {
           type: 'index',
           width: 55,
           align: 'center',
-          showOverflowTooltip: true,
-          fixed: 'left'
+          showOverflowTooltip: true
         },
         {
-          prop: 'code',
-          label: '编码',
+          prop: 'receiveNo',
+          label: '收货单编码',
           align: 'center',
-          minWidth: 110
+          slot: 'receiveNo',
+          showOverflowTooltip: true,
+          minWidth: 180
         },
         {
-          prop: 'workOrderCode',
-          label: '工单编码',
+          prop: 'orderNo',
+          label: '采购订单编码',
           align: 'center',
-          minWidth: 110
-        },
-        {
-          prop: 'warehouseName',
-          label: '仓库名称	',
-          align: 'center'
-        },
-
-        {
-          prop: 'categoryLevelName',
-          label: '物品分类',
-          align: 'center'
-        },
-        {
-          prop: 'categoryName',
-          label: '名称',
-          align: 'center'
-        },
-        { label: '型号', prop: 'modelType', width: '150' },
-        { label: '规格', prop: 'specification', width: '150' },
-        { label: '牌号', prop: 'brandNum', width: '50' },
-        {
-          slot: 'totalCount',
-          label: '总数量',
-          align: 'center'
-        },
-
-        {
-          slot: 'totalPackage',
-          label: '总包装',
-          align: 'center'
-        },
-
-        {
-          slot: 'totalWeight',
-          label: '总重量',
-          align: 'center'
+          slot: 'orderNo',
+          showOverflowTooltip: true,
+          minWidth: 180
         },
         {
-          prop: 'type',
-          label: '入库类型',
+          prop: 'productNames',
+          label: '产品名称',
           align: 'center',
-          formatter: (row, column, cellValue) => {
-            return cellValue==1?'生产入库':""
-          }
+          showOverflowTooltip: true,
+          minWidth: 140
         },
         {
-          prop: 'approvalUserName',
-          label: '审核人',
-          align: 'center'
+          prop: 'supplierName',
+          label: '供应商名称',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 300
         },
-
         {
-          prop: 'createTime',
-          label: '创建时间',
+          prop: 'sendNoteNo',
+          label: '送货单号',
           align: 'center',
           showOverflowTooltip: true,
-          minWidth: 110
-        },
+          minWidth: 200
+        }
       ],
       categoryLevelId: null,
       code: null,
       selection: [],
-      ids:[]
+      ids: []
     };
   },
 
   watch: {},
   methods: {
     datasource({ page, where, limit }) {
-      return warehousing({
+      return purchaseorderreceive({
         ...where,
         pageNum: page,
+        reviewStatus: '2',
         size: limit
       });
     },
     open(ids) {
-    
       this.equipmentdialog = true;
-
-    
     },
-    onDone(){
+    onDone() {
       this.$nextTick(() => {
         this.$refs.equiTable.setSelectedRowKeys(this.ids);
       });
@@ -171,13 +137,17 @@ export default {
       this.$refs.equiTable.clearSelection();
     },
     // 选择
-    selected() {
-      let data=this.type==1?JSON.parse(JSON.stringify(this.selection)):JSON.parse(JSON.stringify(this.current))
-      data['model']=data.specification
-      data['productName']=data.categoryName
-      data['productNumber']=data.totalCount
-      data['productCode']=data.categoryCode
-      
+    async selected() {
+      let data = await purchaseorderreceiveGetById(this.current.id);
+
+      data['code'] = data.receiveNo;
+
+      data.productList = data.productList.map((item) => {
+        item['brandNo'] = item.productBrand;
+        item['productNumber'] = item.totalCount;
+
+        return item;
+      });
       this.$emit('choose', data);
       this.handleClose();
     }

src/views/inspectionPlan/components/workOrder.vue

@@ -18,7 +18,6 @@
             :selection.sync="selection"
             :current.sync="current"
             highlight-current-row
-            
             row-key="id"
             height="50vh"
             @done="onDone"
@@ -35,15 +34,14 @@
 </template>
 
 <script>
-import { workOrder} from '@/api/aps/index.js';
-
+import { workOrder } from '@/api/aps/index.js';
 
 export default {
   components: {},
   props: {
     selectList: Array,
     type: {
-      default: 2//1多选 2单选
+      default: 2 //1多选 2单选
     }
   },
   data() {
@@ -63,130 +61,126 @@ export default {
           columnKey: 'selection',
           align: 'center',
           reserveSelection: true,
-          show:this.type==1
-        },
-        {
-            columnKey: 'index',
-            label: '序号',
-            type: 'index',
-            width: 55,
-            align: 'center',
-            showOverflowTooltip: true,
-            fixed: 'left'
-          },
-          {
-            label: '生产订单号',
-            align: 'center',
-            minWidth: 110,
-            prop: 'code',
-
-          },
-          {
-            prop: 'productionPlanCode',
-            label: '计划编号',
-            align: 'center'
-          },
-          {
-            prop: 'produceRoutingName',
-            label: '工艺路线',
-            align: 'center'
-          },
-          {
-            prop: 'productCode',
-            label: '产品编码',
-            align: 'center'
-          },
-          {
-            prop: 'productName',
-            label: '产品名称',
-            align: 'center'
-          },
-          {
-            prop: 'brandNo',
-            label: '牌号',
-            align: 'center'
-          },
-
-          {
-            prop: 'batchNo',
-            label: '批号',
-            align: 'center',
-            minWidth: 100,
-            showOverflowTooltip: true
-          },
-          {
-            prop: 'model',
-            label: '型号',
-            align: 'center'
-          },
- 
+          show: this.type == 1
+        },
+        {
+          columnKey: 'index',
+          label: '序号',
+          type: 'index',
+          width: 55,
+          align: 'center',
+          showOverflowTooltip: true,
+          fixed: 'left'
+        },
+        {
+          label: '生产订单号',
+          align: 'center',
+          minWidth: 110,
+          prop: 'code'
+        },
+        {
+          prop: 'productionPlanCode',
+          label: '计划编号',
+          align: 'center'
+        },
+        {
+          prop: 'produceRoutingName',
+          label: '工艺路线',
+          align: 'center'
+        },
+        {
+          prop: 'productCode',
+          label: '产品编码',
+          align: 'center'
+        },
+        {
+          prop: 'productName',
+          label: '产品名称',
+          align: 'center'
+        },
+        {
+          prop: 'brandNo',
+          label: '牌号',
+          align: 'center'
+        },
 
-          {
-            prop: 'priority',
-            label: '优先级',
-            align: 'center',
-            minWidth: 120,
-            sortable: 'custom'
-          },
+        {
+          prop: 'batchNo',
+          label: '批号',
+          align: 'center',
+          minWidth: 100,
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'model',
+          label: '型号',
+          align: 'center'
+        },
 
-          {
-            prop: 'formingNum',
-            label: '要求生产数量',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
-          {
-            prop: 'formingWeight',
-            label: '要求生产重量',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110,
-          },
-          {
-            prop: 'planStartTime',
-            label: '计划开始时间',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+        {
+          prop: 'priority',
+          label: '优先级',
+          align: 'center',
+          minWidth: 120,
+          sortable: 'custom'
+        },
 
-          {
-            prop: 'planCompleteTime',
-            label: '计划结束时间',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
+        {
+          prop: 'formingNum',
+          label: '要求生产数量',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
+        {
+          prop: 'formingWeight',
+          label: '要求生产重量',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
+        {
+          prop: 'planStartTime',
+          label: '计划开始时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
 
-          {
-            prop: 'createTime',
-            label: '创建时间',
-            align: 'center',
-            showOverflowTooltip: true,
-            minWidth: 110
-          },
-      
+        {
+          prop: 'planCompleteTime',
+          label: '计划结束时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
 
-          {
-            prop: 'serialNo',
-            label: '客户代号',
-            align: 'center',
-            showOverflowTooltip: true
-          },
+        {
+          prop: 'createTime',
+          label: '创建时间',
+          align: 'center',
+          showOverflowTooltip: true,
+          minWidth: 110
+        },
 
-          {
-            prop: 'simpleName',
-            label: '客户简称',
-            align: 'center',
-            showOverflowTooltip: true
-          },
+        {
+          prop: 'serialNo',
+          label: '客户代号',
+          align: 'center',
+          showOverflowTooltip: true
+        },
 
+        {
+          prop: 'simpleName',
+          label: '客户简称',
+          align: 'center',
+          showOverflowTooltip: true
+        }
       ],
       categoryLevelId: null,
       code: null,
       selection: [],
-      ids:[]
+      ids: []
     };
   },
 
@@ -200,12 +194,9 @@ export default {
       });
     },
     open(ids) {
-    
       this.equipmentdialog = true;
-
-    
     },
-    onDone(){
+    onDone() {
       this.$nextTick(() => {
         this.$refs.equiTable.setSelectedRowKeys(this.ids);
       });
@@ -216,9 +207,21 @@ export default {
     },
     // 选择
     selected() {
-      let data=this.type==1?JSON.parse(JSON.stringify(this.selection)):JSON.parse(JSON.stringify(this.current))
-      data['productNumber']=data.formingNum
-
+      let data =
+        this.type == 1
+          ? JSON.parse(JSON.stringify(this.selection))
+          : JSON.parse(JSON.stringify(this.current));
+      data['productList'] = [
+        {
+          productCode: data.productCode,
+          productName: data.productName,
+          specification: data.model,
+          batchNo: data.batchNo,
+          brandNo: data.brandNo,
+          productNumber: data.formingNum
+        }
+      ];
+      console.log(data)
       this.$emit('choose', data);
       this.handleClose();
     }

src/views/inspectionPlan/index.vue

@@ -104,10 +104,10 @@ export default {
           label: '名称',
           prop: 'name'
         },
-        {
-          prop: 'batchNo',
-          label: '批号'
-        },
+        // {
+        //   prop: 'batchNo',
+        //   label: '批号'
+        // },
 
         {
           label: '类型',

src/views/inspectionWork/components/EquipmentDialog.vue

@@ -1,6 +1,6 @@
 <template>
   <el-dialog
-    title="选择产品"
+    title="选择"
     :visible.sync="equipmentdialog"
     :before-close="handleClose"
     :close-on-click-modal="true"
@@ -17,7 +17,7 @@
               <el-col :span="6">
                 <el-input
                   v-model="code"
-                  placeholder="请输入产品编码"
+                  placeholder="请输入编码"
                   size="small"
                 ></el-input>
               </el-col>
@@ -33,7 +33,7 @@
         <el-col :span="6" class="tree_col">
           <AssetTree
             @handleNodeClick="handleNodeClick"
-            id="9"
+            :id="!isAll?'9':'0'"
             :paramsType="'type'"
             ref="treeList"
           />
@@ -72,7 +72,10 @@ export default {
     selectList: Array,
     type: {
       default: 2 //1多选 2单选
-    }
+    },
+    isAll: {
+      default: false 
+    },
   },
   data() {
     return {
@@ -97,7 +100,7 @@ export default {
         },
         {
           prop: 'code',
-          label: '物品编码',
+          label: '编码',
           align: 'center',
           showOverflowTooltip: true,
           minWidth: 110,
@@ -105,7 +108,7 @@ export default {
         },
         {
           prop: 'name',
-          label: '物品名称',
+          label: '名称',
           align: 'center',
           showOverflowTooltip: true,
           minWidth: 110