fix:问题修改

HuangJi6 · Apr 14, 2023 · 091c097 · 091c097
1 parent 69b3372
commit 091c097
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/src/views/business/inContainer/inContainer.vue b/src/views/business/inContainer/inContainer.vue
@@ -191,7 +191,7 @@
           <vxe-column field="totalPrice" title="总价" width="120"></vxe-column>
           <vxe-column field="hsCode" title="海关编码" width="120"></vxe-column>
           <vxe-column field="goodsNature" title="货物性质" width="120"></vxe-column>
-          <vxe-column field="imgLink" title="产品图片" width="120">
+          <vxe-column type="image" field="imgLink" title="产品图片" width="120">
             <template #default="{ row }">
             <el-image style="width: auto; height: 50px" :src="row.imgLink" :preview-src-list="[row.imgLink]"> </el-image>
           </template>
@@ -226,7 +226,7 @@
           <vxe-form :data="filterFormData" :items="searchForm" titleColon></vxe-form>
             <div style="margin-top:10px;float:right;margin-right:20px">
             <el-button type="danger" @click="filterDialogVisible = false">取 消</el-button>
-            <el-button type="primary" @click="pageList">确 定</el-button>
+            <el-button type="primary" @click="handleRefreshPageList">确 定</el-button>
             </div>
         </vxe-modal>
       </div>

diff --git a/src/views/business/inContainer/js/inContainerMethod.js b/src/views/business/inContainer/js/inContainerMethod.js
@@ -412,6 +412,10 @@ const handleMethods = {
   },
   // 待出库点击编辑按钮
   handleUpdateOutContainer(row) {
+    if (row.isRepacking === '否') {
+      this.$message.warning('请选择需要变更箱规的数据!')
+      return
+    }
     this.handleHttpMethod(getOutOnApi(row.guid), true).then(response => {
       this.updateOutContainerForm = response.data
       this.showUpdateOutContainerComponent = true

diff --git a/src/views/business/outContainer/components/changeOutContainerComponent.vue b/src/views/business/outContainer/components/changeOutContainerComponent.vue
@@ -28,17 +28,18 @@
     :edit-config="{trigger: 'click', mode: 'cell', showStatus: true}">
     <vxe-column type="checkbox" width="45"></vxe-column>
     <vxe-column type="seq" title="序号" width="60"></vxe-column>
-    <vxe-column field="shopName" title="店铺名称" width="150"></vxe-column>
-    <vxe-column field="goodsName" title="中文品名" width="150"></vxe-column>
+    <vxe-column field="shopName" title="店铺名称" width="120"></vxe-column>
+    <vxe-column field="goodsName" title="中文品名" width="180"></vxe-column>
     <vxe-column field="shippingMark" title="箱唛编号" width="150"></vxe-column>
-    <vxe-column field="purNumber" title="库存数量" width="100"></vxe-column>
-    <vxe-column field="totalBox" title="总箱数" width="100"></vxe-column>
+    <vxe-column field="purNumber" title="总数量" width="100"></vxe-column>
+    <vxe-column field="purInNumber" title="库存数量" width="100"></vxe-column>
+    <!-- <vxe-column field="totalBox" title="总箱数" width="100"></vxe-column> -->
     <vxe-column field="boxQuantity" title="单箱数量" width="100"></vxe-column>
-    <vxe-column field="ctnNo" title="制造商编号" width="120" :edit-render="{autofocus: '.vxe-input--inner'}">
+    <!-- <vxe-column field="ctnNo" title="制造商编号" width="120" :edit-render="{autofocus: '.vxe-input--inner'}">
       <template #edit="{ row }">
         <vxe-input v-model="row.ctnNo" type="text"></vxe-input>
       </template>
-    </vxe-column>
+    </vxe-column> -->
     <!-- <vxe-column field="packingBox" title="出库箱数" width="100" :edit-render="{autofocus: '.vxe-input--inner'}">
       <template #edit="{ row }">
         <vxe-input v-model="row.packingBox" type="text"></vxe-input>

diff --git a/src/views/business/outContainer/components/changePackingComponent.vue b/src/views/business/outContainer/components/changePackingComponent.vue
@@ -62,18 +62,18 @@ export default {
             { field: 'packingNo', title: '箱单号', span: 12, itemRender: { name: '$input', props: { disabled: true, placeholder: '请输入箱单号' } } },
             { field: 'shippingMark', title: '箱唛', span: 12, itemRender: { name: '$input', props: { disabled: true, placeholder: '请输入箱唛' } } },
             { field: 'goodsName', title: '商品名称', span: 12, itemRender: { name: '$input', props: { disabled: true, placeholder: '请输入商品名称' } } },
-            { field: 'sku', title: 'SKU', span: 12, itemRender: { name: '$input', props: { disabled: true, placeholder: '请输入商品名称' } } },
-            { field: 'itemId', title: 'itemId', span: 12, itemRender: { name: '$input', props: { disabled: true, placeholder: '请输入商品名称' } } },
+            { field: 'sku', title: 'SKU', span: 12, itemRender: { name: '$input', props: { disabled: true, placeholder: '请输入SKU' } } },
+            { field: 'itemId', title: 'itemId', span: 12, itemRender: { name: '$input', props: { disabled: true, placeholder: '请输入itemId' } } },
             { field: 'packingBox', title: '箱数', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库箱数' } } },
-            { field: 'packingOutNumber', title: '装箱数量', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
-            { field: 'packingBoxQuantity', title: '单箱数量', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
-            { field: 'packingLength', title: '装箱长/CM', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
-            { field: 'packingWidth', title: '装箱宽/CM', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
-            { field: 'packingHigh', title: '装箱高/CM', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
-            { field: 'packingBoxVolume', title: '单箱体积/M', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
-            { field: 'packingTotalVolume', title: '总体积/M', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
-            { field: 'packingBoxWeight', title: '单箱重量/KG', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
-            { field: 'packingTotalWeight', title: '总重量/KG', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } }
+            { field: 'packingOutNumber', title: '出库数量', span: 12, itemRender: { name: '$input', props: { placeholder: '出库数量,需要出多少数量的货物' } } },
+            { field: 'packingBoxQuantity', title: '单箱数量', span: 12, itemRender: { name: '$input', props: { placeholder: '每箱能装多少数量的货物' } } },
+            { field: 'packingLength', title: '装箱长/CM', span: 12, itemRender: { name: '$input', props: { placeholder: '装箱长，更改箱规后箱子的长' } } },
+            { field: 'packingWidth', title: '装箱宽/CM', span: 12, itemRender: { name: '$input', props: { placeholder: '装箱宽，更改箱规后箱子的宽' } } },
+            { field: 'packingHigh', title: '装箱高/CM', span: 12, itemRender: { name: '$input', props: { placeholder: '装箱高，更改箱规后箱子的高' } } },
+            { field: 'packingBoxVolume', title: '单箱体积/M', span: 12, itemRender: { name: '$input', props: { placeholder: '单箱体积，更改箱规后箱子的高' } } },
+            { field: 'packingTotalVolume', title: '总体积/M', span: 12, itemRender: { name: '$input', props: { placeholder: '总体积，更改箱规后箱子占的总体积' } } },
+            { field: 'packingBoxWeight', title: '单箱重量/KG', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入单箱重量' } } },
+            { field: 'packingTotalWeight', title: '总重量/KG', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入总重量' } } }
           ]
         },
         {

diff --git a/src/views/business/outContainer/components/updateOutContainerComponent.vue b/src/views/business/outContainer/components/updateOutContainerComponent.vue
@@ -61,8 +61,8 @@ export default {
             { field: 'packingNo', title: '箱单号', span: 12, itemRender: { name: '$input', props: { disabled: true, placeholder: '请输入箱单号' } } },
             { field: 'shippingMark', title: '箱唛', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入箱唛' } } },
             { field: 'ctnNo', title: '制造商编号', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入制造商编号' } } },
-            { field: 'packingBox', title: '装箱箱数', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库箱数' } } },
-            { field: 'packingOutNumber', title: '装箱数量', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
+            { field: 'packingBox', title: '出库箱数', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库箱数' } } },
+            { field: 'packingOutNumber', title: '出库数量', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入出库数量' } } },
             { field: 'isRepacking', title: '是否变更箱规', span: 12, itemRender: { name: '$input', props: { placeholder: '请输入是否重新装箱' } } }
           ]
         },