add

src/api/mes/index.js

@@ -59,3 +59,11 @@ export async function purchaseorderGetById(id) {
   }
   return Promise.reject(new Error(res.data.message));
 }
+
+export async function contactlink(params) {
+  const res = await request.get(`/eom/contactlink/list`, { params });
+  if (res.data.code == 0) {
+    return res.data;
+  }
+  return Promise.reject(new Error(res.data.message));
+}

src/enum/dict.js

@@ -11,5 +11,6 @@ export default {
   时间单位: 'time_unit',
   仓库状态: 'warehouse_status',
   仓库类型: 'WD_inventoryList',
-  经销商列表: 'supplierList'
+  经销商列表: 'supplierList',
+  重量单位: 'weight_unit'
 };

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -145,6 +145,31 @@
             </el-form-item>
           </el-col>
 
+          <el-col :span="8" v-if="formData.bizType == 3">
+            <el-form-item label="客户名称">
+              <el-input
+                placeholder="客户名称"
+                disabled
+                v-model="formData.clientName"
+                clearable /></el-form-item
+          ></el-col>
+          <el-col :span="8" v-if="formData.bizType == 3">
+            <el-form-item label="客户联系人">
+              <el-input
+                placeholder="客户联系人"
+                disabled
+                v-model="formData.clientUser"
+                clearable /></el-form-item
+          ></el-col>
+          <el-col :span="8" v-if="formData.bizType == 3">
+            <el-form-item label="客户电话">
+              <el-input
+                placeholder="客户电话"
+                disabled
+                v-model="formData.clientPhone"
+                clearable /></el-form-item
+          ></el-col>
+
           <el-col :span="8">
             <el-form-item label="权属部门" prop="deptName">
               <el-input
@@ -625,6 +650,9 @@
         this.formData.sourceBizNo = '';
         this.warehousingMaterialList = [];
         this.$refs.trees.valueTitle = '';
+        this.formData.clientName = '';
+        this.formData.clientUser = '';
+        this.formData.clientPhone = '';
         this.title = '';
         this.$forceUpdate();
       },
@@ -635,6 +663,9 @@
         this.title = row.tableData[0].productName;
         this.formData.sourceBizNo = row.orderNo;
         this.formData.sid = row.id;
+        this.formData.clientName = row.contactName;
+        this.formData.clientUser = row.linkName;
+        this.formData.clientPhone = row.linkPhone;
         this.onSelectTableData(row.tableData, 1);
         this.$forceUpdate();
       },
@@ -808,7 +839,7 @@
       // },
       handleSetting(row) {
         row.bizTypes = this.formData.bizType;
-        row.type = this.bizType == 3 ? 1 : 0;
+        row.type = this.formData.bizType == 3 ? 1 : 0;
         this.$refs.detailSelectRef
           .open(row, row.warehouseLedgerDetails || [])
           .then((res) => {
@@ -854,6 +885,9 @@
         this.warehousingMaterialList.splice(index, 1);
         if (this.warehousingMaterialList.length == 0) {
           this.formData.sourceBizNo = '';
+          this.formData.extInfo.clientName = '';
+          this.formData.extInfo.clientUser = '';
+          this.formData.extInfo.clientUserPhone = '';
         }
       },
       // 出库明细生成条码信息
@@ -940,6 +974,7 @@
             }
             obj.outInDetailAddPOList = arr;
             obj.extInfo.sourceBizNo = obj.sourceBizNo;
+            obj.fromType = obj.type;
             this.saveLoading = true;
 
             // console.log('明细', this.warehousingMaterialList);

src/views/warehouseManagement/outgoingManagement/components/detailSelect.vue

@@ -334,7 +334,8 @@
         // console.log('wqwq', this.infoData.assetCode);
         this.formData = { pageNum: 1, size: 10, type: infoData.type };
         if (this.infoData.bizTypes == 3) {
-          this.formData.code = this.infoData.assetCode;
+          // this.formData.code = this.infoData.assetCode;
+          this.$set(this.formData, 'code', this.infoData.assetCode);
         }
         this.formData.dateType = 2;
 

src/views/warehouseManagement/outgoingManagement/details.vue

@@ -36,6 +36,20 @@
                   <span>{{ getSceneState(infoData.bizType) }}</span>
                 </el-form-item>
               </el-col>
+              <el-col :span="8" v-if="infoData.bizType == 3">
+                <el-form-item label="客户名称">
+                  <span>{{ infoData.clientName }}</span>
+                </el-form-item> </el-col
+              ><el-col :span="8" v-if="infoData.bizType == 3">
+                <el-form-item label="客户联系人">
+                  <span>{{ infoData.clientUser }}</span>
+                </el-form-item> </el-col
+              ><el-col :span="8" v-if="infoData.bizType == 3">
+                <el-form-item label="客户电话">
+                  <span>{{ infoData.clientPhone }}</span>
+                </el-form-item>
+              </el-col>
+
               <el-col :span="8">
                 <el-form-item
                   :label="infoData.bizType == 4 ? '领料单' : '来源单据'"

src/views/warehouseManagement/stockManagement/add.vue

@@ -187,21 +187,15 @@
                 v-model="formData.supplierCode"
                 clearable /></el-form-item
           ></el-col> -->
-          <el-col :span="8" v-if="formData.bizType == 2">
+          <!-- <el-col :span="8" v-if="formData.bizType == 2">
             <el-form-item label="客户" prop="clientName">
-              <!-- <DictSelection
-                dictName="经销商列表"
-                clearable
-                v-model="formData.clientName"
-                @itemChange="ChangeSuppliers"
-              /> -->
               <el-input
                 placeholder="请输入"
                 clearable
                 v-model="formData.clientName"
               />
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <!-- <el-col :span="8" v-if="formData.bizType == 2">
             <el-form-item label="客户代号" prop="clientCode">
               <el-input
@@ -225,12 +219,12 @@
                 placeholder="请选择送货人"
               >
                 <el-option
-                  v-for="item in fromUserList"
+                  v-for="item in contactList"
                   :key="item.id"
-                  :label="item.name"
+                  :label="item.linkName"
                   :value="item.id"
                   @click.native="
-                    () => (formData.extInfo.deliveryPhone = item.phone)
+                    () => (formData.extInfo.deliveryPhone = item.mobilePhone)
                   "
                 >
                 </el-option>
@@ -776,7 +770,7 @@
               prop="onlyCode"
             ></el-table-column>
             <el-table-column
-              v-if="title == '物料'"
+              v-if="formData.bizType == 2 || formData.bizType == 1"
               label="物料代号"
               prop="materielCode"
             >
@@ -785,7 +779,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="title == '物料'"
+              v-if="formData.bizType == 2 || formData.bizType == 1"
               label="客户代号"
               prop="clientCode"
             >
@@ -793,11 +787,37 @@
                 <el-input v-model="row.clientCode"></el-input>
               </template>
             </el-table-column>
-            <el-table-column v-if="title == '物料'" label="重量" prop="weight">
+            <el-table-column
+              v-if="formData.bizType == 2 || formData.bizType == 1"
+              label="重量"
+              prop="weight"
+            >
               <template slot-scope="{ row }">
                 <el-input v-model="row.weight"></el-input>
               </template>
             </el-table-column>
+            <el-table-column
+              v-if="formData.bizType == 2 || formData.bizType == 1"
+              label="重量单位"
+              prop="weightUtil"
+            >
+              <template slot-scope="{ row }">
+                <DictSelection
+                  dictName="重量单位"
+                  clearable
+                  v-model="row.weightUtil"
+                />
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="formData.bizType == 1"
+              label="刻码"
+              prop="engrave"
+            >
+              <template slot-scope="{ row }">
+                <el-input v-model="row.engrave"></el-input>
+              </template>
+            </el-table-column>
             <el-table-column label="包装编码" prop="num"></el-table-column>
             <el-table-column label="批次号" prop="batchNo"></el-table-column>
             <el-table-column
@@ -940,7 +960,7 @@
   import { tableHeader } from '../common';
   import { getCode } from '@/api/codeManagement/index.js';
   import { number } from 'echarts/core';
-  import { purchaseorderGetById } from '@/api/mes';
+  import { purchaseorderGetById, contactlink } from '@/api/mes';
   export default {
     components: {
       selectUpload,
@@ -953,6 +973,7 @@
     },
     data() {
       return {
+        contactList: [],
         pickerRow: {},
         fromUserList: [],
         codeList: [],
@@ -1041,6 +1062,12 @@
       this.initData();
     },
     methods: {
+      async searchContact(id) {
+        console.log(id);
+        const data = await contactlink({ contactId: id });
+        console.log(data);
+        this.contactList = data.data;
+      },
       async pickerSuccess(row) {
         console.log('===row', row);
         this.pickerRow = row;
@@ -1049,6 +1076,7 @@
         this.formData.clientCode = row.partaId;
         this.formData.extInfo.supplierName = row.partbName;
         this.formData.extInfo.supplierId = row.partbId;
+        await this.searchContact(row.partbId);
         const data = await purchaseorderGetById(row.id);
         if (this.warehousingMaterialList.length == 0) {
           let list = data.data.productList.map((item) => {
@@ -1573,7 +1601,9 @@
                     packageNo: it.num,
                     clientCode: it.clientCode,
                     materielCode: it.materielCode,
-                    weight: it.weight
+                    weight: it.weight,
+                    weightUtil: it.weightUtil,
+                    engrave: it.engrave
                   };
                 });
                 item.outInDetailRecordAddPOList = list;
@@ -1603,7 +1633,6 @@
       },
       //添加明细
       async onSelectTableData(val) {
-        console.log('qwfffffffffffff===', val);
         const res = await getCode('lot_number_code');
 
         this.warehousingMaterialList.push(

src/views/warehouseManagement/stockManagement/details.vue

@@ -369,7 +369,7 @@
             ></el-table-column>
 
             <el-table-column
-              v-if="handleAssetType(extInfo.assetType) == '物料'"
+              v-if="infoData.bizType == 2 || infoData.bizType == 1"
               label="物料代号"
               prop="materielCode"
             >
@@ -378,7 +378,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="handleAssetType(extInfo.assetType) == '物料'"
+              v-if="infoData.bizType == 2 || infoData.bizType == 1"
               label="客户代号"
               prop="clientCode"
             >
@@ -387,7 +387,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="handleAssetType(extInfo.assetType) == '物料'"
+              v-if="infoData.bizType == 2 || infoData.bizType == 1"
               label="重量"
               prop="weight"
             >
@@ -395,6 +395,25 @@
                 {{ row.weight }}
               </template>
             </el-table-column>
+            <el-table-column
+              v-if="infoData.bizType == 2 || infoData.bizType == 1"
+              label="重量单位"
+              prop="weightUtil"
+            >
+              <template slot-scope="{ row }">
+                {{ row.weightUtil }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              v-if="infoData.bizType == 1"
+              label="刻码"
+              prop="engrave"
+            >
+              <template slot-scope="{ row }">
+                {{ row.engrave }}
+              </template>
+            </el-table-column>
 
             <el-table-column
               label="包装编码"