chenrui 2 anos atrás
pai
commit
dbf2d4b74c

+ 3 - 3
src/views/bulkManagement/bulkWarehousingOrder/edit.vue

@@ -199,7 +199,7 @@
                         type="link"
                         @click="delBulkOrder"
                         :loading="delLoading"
-                        id="bulkWarehousingOrderEdit-del-all">整单删除</a-button>
+                        id="bulkWarehousingOrderEdit-del-all">清空列表</a-button>
                     </a-col>
                   </a-row>
                 </a-form>
@@ -654,12 +654,12 @@ export default {
         }
       })
     },
-    // 整单删除
+    // 清空列表
     delBulkOrder () {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '删除后不可恢复,确认删除所有已选产品吗?',
+        content: '删除后不可恢复,确认要清空已选产品列表吗?',
         centered: true,
         closable: true,
         onOk () {

+ 3 - 3
src/views/inventoryManagement/inventoryWarning/chooseImportModal.vue

@@ -100,14 +100,14 @@ export default {
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '17%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'productName', width: '26%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '在途数(个)', dataIndex: 'inTransit', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '在途数(个)', dataIndex: 'inTransit', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最大库存数(个)', dataIndex: 'upperLimit', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最小库存数(个)', dataIndex: 'lowerLimit', width: '10%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ],
       nowUnColumns: [ //  不可导入
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
         { title: '产品编码', dataIndex: 'productCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '在途数(个)', dataIndex: 'inTransit', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        // { title: '在途数(个)', dataIndex: 'inTransit', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最大库存数(个)', dataIndex: 'upperLimit', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '最小库存数(个)', dataIndex: 'lowerLimit', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '错误原因', scopedSlots: { customRender: 'errorMsg' }, width: '10%', align: 'center' }
@@ -147,7 +147,7 @@ export default {
       } else {
         this.spinning = true
         stockWarnBatchImport(this.loadData).then(res => {
-          if(res.status == 200){
+          if (res.status == 200) {
             this.$emit('ok', this.loadData)
             this.isShow = false
           }

+ 3 - 3
src/views/inventoryManagement/inventoryWarning/importGuideModal.vue

@@ -15,7 +15,7 @@
             <span>1</span>准备导入
           </div>
           <ul>
-            <li>1)导入的Excel文件中必须包含名称为“产品编码”、"在途数(个)”、“最大库存数(个)”、“最小库存数(个)”的列,且名称必须相同,其他列可自定义,不影响数据导入</li>
+            <li>1)导入的Excel文件中必须包含名称为“产品编码”、“最大库存数(个)”、“最小库存数(个)”的列,且名称必须相同,其他列可自定义,不影响数据导入</li>
             <li><a :href="templUrl"><a-icon type="download" />下载导入模板</a></li>
           </ul>
         </div>
@@ -85,7 +85,7 @@ export default {
       uploadParams: {
         savePathType: 'local'
       },
-      templUrl: location.protocol + '//' +location.host + '/templ/库存预警产品导入模板.xlsx'
+      templUrl: location.protocol + '//' + location.host + '/templ/库存预警产品导入模板.xlsx'
     }
   },
   methods: {
@@ -116,7 +116,7 @@ export default {
     handleClose () {
       this.openImportModal = false
       this.isShow = false
-    },
+    }
   },
   watch: {
     //  父页面传过来的弹框状态

+ 2 - 2
src/views/purchasingManagement/purchaseReturnApplyForm/edit.vue

@@ -140,7 +140,7 @@
                   class="button-error"
                   id="purchaseReturnEdit-delAll-btn"
                   @click.stop="handleDel('', 'all')"
-                >整单删除</a-button>
+                >清空列表</a-button>
               </div>
             </div>
             <!-- 列表 -->
@@ -428,7 +428,7 @@ export default {
         this.$message.info('没有可删除的产品')
         return
       }
-      const content = isAll ? '删除后不可恢复,确定要进行整单删除吗?' : '删除后不可恢复,确定要进行删除吗?'
+      const content = isAll ? '删除后不可恢复,确定要清空已选产品列表吗?' : '删除后不可恢复,确定要进行删除吗?'
       this.$confirm({
         title: '提示',
         content: content,

+ 2 - 0
src/views/reportData/storeReceivedSendStorageReport/list.vue

@@ -46,6 +46,7 @@
         class="sTable"
         ref="table"
         size="small"
+        rowKeyName="no"
         :rowKey="(record) => record.no"
         :columns="columns"
         :data="loadData"
@@ -226,6 +227,7 @@ export default {
                 { no: 8, beginDetail: null, beginAmount: null, putDetail: '散件导入', putAmount: res.data.putSparePartsImportAmount, outDetail: null, outAmount: null, endDetail: null, endAmount: null },
                 { no: 9, beginDetail: null, beginAmount: null, putDetail: null, putAmount: null, outDetail: '店内调出', outAmount: res.data.outShopCallOutAmount, endDetail: null, endAmount: null },
                 { no: 10, beginDetail: null, beginAmount: null, putDetail: null, putAmount: null, outDetail: '急件冲减', outAmount: res.data.outDispatchDeductAmount, endDetail: null, endAmount: null },
+                { no: 11, beginDetail: null, beginAmount: null, putDetail: '货架调回', putAmount: res.data.putSparePartsImportAmount, outDetail: '货架补货', outAmount: res.data.outDispatchDeductAmount, endDetail: null, endAmount: null },
                 { no: '成本合计', beginDetail: ' ', beginAmount: res.data.beginAmount, putDetail: ' ', putAmount: res.data.putAmount, outDetail: ' ', outAmount: res.data.outAmount, endDetail: '月末余额', endAmount: res.data.endAmount }
               ]
             } else {

+ 4 - 4
src/views/salesManagement/salesQuery/edit.vue

@@ -116,7 +116,7 @@
                   ghost
                   @click="delSalerOrder"
                   :loading="delLoading"
-                  id="salesEdit-del-all">整单删除</a-button>
+                  id="salesEdit-del-all">清空列表</a-button>
               </div>
             </a-col>
           </a-row>
@@ -508,7 +508,7 @@ export default {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '确认删除该销售单吗?',
+        content: '确认要清空已选产品列表吗?',
         centered: true,
         closable: true,
         onOk () {
@@ -660,8 +660,8 @@ export default {
           if (this.showShelfModal) {
             this.$refs.chooseShelfProduct.reload()
           }
-        }else{
-          if(res.errCode == 'VALID_F_00001'){
+        } else {
+          if (res.errCode == 'VALID_F_00001') {
             this.productForm = {
               productName: '',
               productCode: row.productCode || '',

+ 3 - 3
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -85,7 +85,7 @@
                   @click="salesReturnDelAll"
                   :loading="delLoading"
                   style="margin-left: 10px"
-                  id="salesReturn-del-all">整单删除</a-button>
+                  id="salesReturn-del-all">清空列表</a-button>
               </div>
             </a-col>
           </a-row>
@@ -391,12 +391,12 @@ export default {
         }
       })
     },
-    // 整单删除
+    // 清空列表
     salesReturnDelAll () {
       const _this = this
       this.$confirm({
         title: '提示',
-        content: '确认要整单删除吗?',
+        content: '确认要清空已选产品列表吗?',
         centered: true,
         closable: true,
         onOk () {