From 652d4e79dacc00ebf4f1c08f73a22aa0ca5b6be9 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 29 Jul 2024 12:54:27 +0800
Subject: [PATCH] md

---
 src/views/emis/emisSite/emisSiteForm.vue      | 26 +++--
 .../emisWarehouseInBatch/WarehouseStockIn.vue | 96 ++++++++++---------
 2 files changed, 69 insertions(+), 53 deletions(-)

diff --git a/src/views/emis/emisSite/emisSiteForm.vue b/src/views/emis/emisSite/emisSiteForm.vue
index c3ae8567..2b147b11 100644
--- a/src/views/emis/emisSite/emisSiteForm.vue
+++ b/src/views/emis/emisSite/emisSiteForm.vue
@@ -1,7 +1,8 @@
 <template>
   <div >
-    <el-row :gutter="0" style="flex-direction: column;">
-        <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
+    <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="80px">
+
+    <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
           <el-col :span="8">
             <el-form-item label="网点编号" prop="siteCode">
               <el-input v-model="form.siteCode" placeholder="网点编号" :disabled="form.id !=null" />
@@ -54,9 +55,9 @@
                 </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12">
-            <el-form-item label="运输方式" prop="transTypeId">
-              <el-select  multiple clearable v-model="form.transTypeId" placeholder="运输方式"  >
+          <el-col :span="8">
+            <el-form-item label="运输方式" prop="transTypeIdArr">
+              <el-select  multiple clearable v-model="form.transTypeIdArr" placeholder="运输方式"  >
                   <el-option
                     v-for="item in dict.type.emis_biz_shipping_method"
                     v-bind:key="item.value"
@@ -281,8 +282,8 @@
               <el-input v-model="form.incrementService" type="textarea" placeholder="请输入增值服务" />
             </el-form-item>
           </el-col>
-        </el-form>
       </el-row>
+    </el-form>
       <div style="text-align: center;margin-bottom: 10px;">
         <el-button type="primary" @click="submitForm">确 定</el-button>
         <el-button @click="cancel">取 消</el-button>
@@ -386,6 +387,13 @@ export default {
           this.loading = true;
           getEmisSite(this.id).then(response => {
             this.form = response.data;
+            if(this.form.transTypeId){
+              // this.form.transTypeId=[];
+              //  let typeArr=this.form.transTypeId.split(",");
+              //  typeArr.forEach()
+              this.$set(this.form,"transTypeIdArr",this.form.transTypeId.split(","))
+              // this.form.transTypeIdArr=this.form.transTypeId.split(",");
+            }
             this.loading = false;
           });
         }else{
@@ -592,6 +600,7 @@ export default {
         address: null,
         dispDeliveryMode: null,
         transTypeId: null,
+        transTypeIdArr:[],
         transTypeName: null,
         orgId: null,
         orgName: null,
@@ -650,6 +659,11 @@ export default {
     submitForm() {
       this.$refs["form"].validate(valid => {
         if (valid) {
+
+          if(this.form.transTypeIdArr){
+            this.form.transTypeId=this.form.transTypeIdArr.join(",");
+          }
+
           if (this.form.id != null) {
             updateEmisSite(this.form).then(response => {
               this.$modal.msgSuccess("修改成功");
diff --git a/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue b/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
index 7b32d788..81090b38 100644
--- a/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
+++ b/src/views/emis/emisWarehouseInBatch/WarehouseStockIn.vue
@@ -1,11 +1,10 @@
 <template>
    <div class="app-container">
-
+    <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="100px">
     <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
-      <el-col :span="18" style="    border-right: 1px solid #e6ebf5;
-    padding-right: 20px;">
+      <el-col :span="18" style="    border-right: 1px solid #e6ebf5;padding-right: 20px;">
         <div class="head-container">
-          <el-form ref="form" :model="form" size="mini" :rules="rules" label-width="100px">
+
             <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
               <el-col :span="12">
                 <el-form-item label="主进仓单号" prop="inNo">
@@ -99,10 +98,10 @@
               </el-col> -->
 
             </el-row>
-          </el-form>
+
         </div>
           <el-collapse v-model="activeNames">
-            <el-collapse-item title="" name="2">
+            <el-collapse-item title="" name="1">
               <template slot="title">
                 <div class="form-group-title"><span class="title">{{ $t('录入入仓明细') }}</span></div>
               </template>
@@ -131,18 +130,19 @@
                                 'padding': '0px!important',
                                 'padding-left': '0px!important',
                                 'padding-right': '0px!important',
-                                'font-size':'13px'
+                                'font-size':'12px'
                               }"
                               :header-cell-style="{
-                                'font-size':'13x'
+                                'font-size':'12x'
                               }"
                               border
                               stripe
                               :data="form.cargoList"
                               size="mini"
                               style="width: 100%"
-                              max-height="300px"
+
                             >
+                            <!-- max-height="400px" -->
 
                               <el-table-column  :label="$t('序号')" align="center" width="60">
                                     <template slot-scope="scope">
@@ -155,17 +155,18 @@
                                   <!-- <el-input  v-model="scope.row.goodsName" size="mini" placeholder=""></el-input> -->
                                 </template>
                               </el-table-column>
+                              <el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
+                                <template slot-scope="scope">
+                                  <el-input  v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
+                                </template>
+                              </el-table-column>
 
                               <!-- <el-table-column prop="goodsName" label="品牌" align="center" width="60" :show-overflow-tooltip="true">
                                 <template slot-scope="scope">
                                   <el-input  v-model="scope.row.brand" size="mini" placeholder=""></el-input>
                                 </template>
                               </el-table-column>
-                              <el-table-column prop="goodsModel" label="规格型号" align="center" width="80" :show-overflow-tooltip="true">
-                                <template slot-scope="scope">
-                                  <el-input  v-model="scope.row.goodsModel" size="mini" placeholder=""></el-input>
-                                </template>
-                              </el-table-column>
+
 
                               <el-table-column prop="hscode" label="海关编码" align="center" width="80" :show-overflow-tooltip="true">
                                 <template slot-scope="scope">
@@ -199,22 +200,22 @@
                                 </template>
                               </el-table-column> -->
 
-                              <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="60">
+                              <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="80">
                                 <template slot-scope="scope">
                                   <el-input  v-model="scope.row.length"   size="mini" placeholder=""></el-input>
                                 </template>
                               </el-table-column>
-                              <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="60">
+                              <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="80">
                                 <template slot-scope="scope">
                                   <el-input  v-model="scope.row.width"  size="mini" placeholder=""></el-input>
                                 </template>
                               </el-table-column>
-                              <el-table-column prop="height"   :label="$t('高(cm)')" align="center" width="60">
+                              <el-table-column prop="height"   :label="$t('高(cm)')" align="center" width="80">
                                 <template slot-scope="scope">
                                   <el-input  v-model="scope.row.height"   size="mini" placeholder=""></el-input>
                                 </template>
                               </el-table-column>
-                              <el-table-column prop="price" label="单价" align="center" width="60" :show-overflow-tooltip="true">
+                              <el-table-column prop="price" label="单价" align="center" width="80" :show-overflow-tooltip="true">
                                 <template slot-scope="scope">
                                   <el-input  v-model="scope.row.price" size="mini" placeholder=""></el-input>
                                 </template>
@@ -252,13 +253,35 @@
                       <FileUpload  :showTip="true" :fileSize="10" v-model="form.filePath" :isNeedUpload="true" :fileType="['pdf','xlsx','xls','jpg','bmp','png']" :limit="10"></FileUpload>
                     </div>
                 </el-col> -->
-              </el-row>
-              <div style="text-align: center;margin-bottom: 50px;margin-top: 50px;">
+
+
+              </el-row >
+            </el-collapse-item>
+
+
+            <el-collapse-item title="" name="2">
+              <template slot="title">
+                <div class="form-group-title"><span class="title">{{ $t('收货图片') }}</span></div>
+              </template>
+
+              <div>
+                  <el-row :gutter="24">
+                    <el-col :span="24">
+                      <el-form-item label="收货图片" prop="xxx" label-width="80px">
+                        <ImageUpload ref="imageUpload" v-model="form.picUrl" :fileSize="1" :limit="20" @input="handleInput" ></ImageUpload>
+                        </el-form-item>
+                    </el-col>
+                  </el-row >
+              </div>
+
+            </el-collapse-item>
+
+          </el-collapse>
+
+          <div style="text-align: center;margin-bottom: 50px;margin-top: 50px;">
                       <el-button type="primary" @click="submitForm">确 定</el-button>
                       <el-button @click="cancel">取 消</el-button>
                     </div>
-            </el-collapse-item>
-          </el-collapse>
 
       </el-col>
 	    <el-col :span="6">
@@ -267,7 +290,7 @@
         </div>
       </el-col>
     </el-row>
-
+    </el-form>
 
 
 
@@ -418,6 +441,7 @@ export default {
         totalVolume: null,
         totalWeight: null,
         remark: null,
+        picUrl:null,
         tenantId: null,
         delFlag: null,
         createBy: null,
@@ -448,32 +472,10 @@ export default {
         }
       });
     },
-    //   /** 转换菜单数据结构 */
-    //  normalizer(node) {
-    //   if (node.children && !node.children.length) {
-    //     delete node.children;
-    //   }
-    //   return {
-    //     id: node.id,
-    //     label: node.idName,
-    //     children: node.children
-    //   };
-    // },
-    //  /** 查询菜单下拉树结构 */
-    // getTreeselect() {
-    //   const queryParams = {}
-    //   listEmisWarehouseInBatch(queryParams).then(response => {
-    //     this.emisWarehouseInBatchOptions = [];
-    //     const rootItem = { idId: 0, emisWarehouseInBatchName: '-', children: [] };
-    //     rootItem.children = this.handleTree(response.data, "id");
-    //     this.emisWarehouseInBatchOptions.push(rootItem);
+    async handleInput(item, size){
 
-    //     if(this.parentId != undefined) {
-    //       this.form.parentId = this.parentId;
-    //     }
+    },
 
-    //   });
-    // },
   }
 };
 </script>