add

src/views/warehouseManagement/outgoingManagement/add.vue

@@ -947,18 +947,18 @@
             // delete newObj.inOutAddPO.extInfo;
             console.log('2222', obj);
 
-            const res = await outin.save(obj);
-            if (res.code == 0) {
-              this.$message.success('保存成功！');
-            }
+            // const res = await outin.save(obj);
+            // if (res.code == 0) {
+            //   this.$message.success('保存成功！');
+            // }
 
-            this.saveLoading = false;
-            this.$router.push('/warehouseManagement/outgoingManagement');
+            // this.saveLoading = false;
+            // this.$router.push('/warehouseManagement/outgoingManagement');
 
-            if (res?.success) {
-              this.$message.success('保存成功！');
-              this.$router.go(-1);
-            }
+            // if (res?.success) {
+            //   this.$message.success('保存成功！');
+            //   this.$router.go(-1);
+            // }
           }
         });
       },

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

@@ -148,7 +148,7 @@
                 for (const i in data) {
                   if (
                     listParent[key].orderNo == data[i].orderNo &&
-                    listParent[key].ids == data[i].id
+                    listParent[key].productId == data[i].id
                   ) {
                     arr.push({ ...data[i] });
                   }
@@ -160,7 +160,7 @@
                   tableData: rep.data.productList.map((item) => {
                     return {
                       ...item,
-                      ids: arr[0].id,
+                      productId: arr[0].id,
                       code: item.productCode,
                       name: item.productName,
                       contactCode: arr[0].contactCode
@@ -193,7 +193,7 @@
           tableData: res.data.productList.map((item) => {
             return {
               ...item,
-              ids: this.current.id,
+              productId: this.current.id,
               code: item.productCode,
               name: item.productName,
               contactCode: this.current.contactCode

src/views/warehouseManagement/stockManagement/add.vue

@@ -157,7 +157,7 @@
             >
             </el-date-picker></el-form-item
         ></el-col> -->
-          <el-col :span="8">
+          <el-col :span="8" v-if="formData.bizType != 2">
             <el-form-item label="供应商" prop="supplierId">
               <DictSelection
                 dictName="经销商列表"
@@ -167,7 +167,7 @@
               />
             </el-form-item>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="8" v-if="formData.bizType != 2">
             <el-form-item label="供应商代号" prop="supplierCode">
               <el-input
                 placeholder="请输入"
@@ -179,7 +179,7 @@
               <DictSelection
                 dictName="经销商列表"
                 clearable
-                v-model="formData.extInfo.clientName"
+                v-model="formData.clientName"
                 @itemChange="ChangeSuppliers"
               />
             </el-form-item>
@@ -192,21 +192,41 @@
                 clearable /></el-form-item
           ></el-col>
 
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="送货人" prop="fromUser">
               <el-input
                 placeholder="请输入"
                 v-model="formData.fromUser"
                 clearable /></el-form-item
+          ></el-col> -->
+          <el-col :span="8">
+            <el-form-item label="送货人" prop="fromUser">
+              <el-select
+                v-model="formData.fromUser"
+                filterable
+                placeholder="请选择送货人"
+              >
+                <el-option
+                  v-for="item in fromUserList"
+                  :key="item.id"
+                  :label="item.name"
+                  :value="item.id"
+                  @click.native="
+                    () => (formData.extInfo.deliveryPhone = item.phone)
+                  "
+                >
+                </el-option>
+              </el-select> </el-form-item
           ></el-col>
           <el-col :span="8">
             <el-form-item label="送货人联系方式" prop="deliveryPhone">
               <el-input
+                disabled
                 placeholder="请输入"
                 v-model="formData.extInfo.deliveryPhone"
                 clearable /></el-form-item
           ></el-col>
-          <el-col :span="8">
+          <!-- <el-col :span="8">
             <el-form-item label="紧急状态" prop="urgent">
               <el-select
                 filterable
@@ -221,7 +241,7 @@
                   :label="item.label"
                 ></el-option>
               </el-select> </el-form-item
-          ></el-col>
+          ></el-col> -->
           <el-col :span="8">
             <el-form-item label="审核人部门" prop="verifyDeptName">
               <selectTree
@@ -886,6 +906,7 @@
     },
     data() {
       return {
+        fromUserList: [],
         codeList: [],
         materialType,
         warehousingType,
@@ -1024,7 +1045,7 @@
         this.formData.extInfo.supplierName = data.dictValue;
       },
       ChangeSuppliers(data) {
-        this.formData.extInfo.clientName = data.dictValue;
+        this.formData.clientName = data.dictValue;
       },
 
       rowClass({ row, column, rowIndex, columnIndex }) {
@@ -1544,9 +1565,17 @@
         });
         // const res111 = await warehouseDefinition.list();
         // this.warehouseList = res111.list;
+        let res22 = await warehouseDefinition.getUserPage({
+          size: -1,
+          page: 1
+        });
+        this.fromUserList = res22.list;
         const info = JSON.parse(localStorage.getItem('info'));
-        let obj = res.find((item) => item.id === info.deptId);
+        let obj = res.find(
+          (item) => item.id === info.deptId[info.deptId.length - 1]
+        );
         if (!obj) return;
+        this.formData.extInfo.deptCode = obj.id;
         this.formData.extInfo.deptName = obj.name;
         this.formData.extInfo.createUserName = info.name;
         this.formData.createUserId = info.id;

src/views/warehouseManagement/stockManagement/details.vue

@@ -30,7 +30,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item label="入库场景:">
-                  <span>{{ getSceneState(infoData.type) }}</span>
+                  <span>{{ getSceneState(infoData.bizType) }}</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">
@@ -48,11 +48,11 @@
                   <span>{{ extInfo.createUserName }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <!-- <el-col :span="8">
                 <el-form-item label="创建时间:">
                   <span>{{ infoData.createTime }}</span>
                 </el-form-item>
-              </el-col>
+              </el-col> -->
               <el-col :span="8">
                 <el-form-item label="入库时间:">
                   <span>{{ infoData.createTime }}</span>
@@ -68,11 +68,26 @@
                   <span>{{ infoData.verifyName }}</span>
                 </el-form-item>
               </el-col>
-              <el-col :span="8">
+              <el-col :span="8" v-if="infoData.bizType == 2">
+                <el-form-item label="客户:">
+                  <span>{{ infoData.clientName }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" v-if="infoData.bizType == 2">
+                <el-form-item label="客户代码:">
+                  <span>{{ infoData.clientCode }}</span>
+                </el-form-item>
+              </el-col>
+              <el-col :span="8" v-if="infoData.bizType != 2">
                 <el-form-item label="供应商:">
                   <span>{{ extInfo.supplierName }}</span>
                 </el-form-item>
               </el-col>
+              <el-col :span="8" v-if="infoData.bizType != 2">
+                <el-form-item label="供应商代码:">
+                  <span>{{ extInfo.supplierCode }}</span>
+                </el-form-item>
+              </el-col>
               <el-col :span="8">
                 <el-form-item label="送货人:">
                   <span>{{ infoData.fromUser }}</span>