chenrui 3 سال پیش
والد
کامیت
a790fe5be6

+ 2 - 2
src/api/allocateBill.js

@@ -111,7 +111,7 @@ export const allocateBillDetailPrint = params => {
     responseType: 'blob'
   })
 }
-// 调拨管理 导入产品
+// 调拨管理 下载模板
 export const allocateBillDownload = params => {
   return axios.request({
     url: `allocateBill/detail/downloadExcel`,
@@ -127,7 +127,7 @@ export const allocateBillParseProducts = params => {
     method: 'post'
   })
 }
-// 调拨管理  解析导入的文件
+// 调拨管理  批量插入
 export const allocateBillBatchInsert = params => {
   return axios({
     url: '/allocateBill/detail/batchInsert',

+ 2 - 2
src/views/allocationManagement/transferOut/chooseImportModal.vue

@@ -83,7 +83,7 @@ export default {
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'qtyText', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存', dataIndex: 'currentStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       nowUnColumns: [ //  促销品
         { title: '序号', dataIndex: 'no', width: 70, align: 'center' },
@@ -91,7 +91,7 @@ export default {
         { title: '产品名称', dataIndex: 'productName', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '数量', dataIndex: 'qtyText', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '库存', dataIndex: 'currentStockQty', width: 80, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '单位', dataIndex: 'productEntity.unit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '单位', dataIndex: 'productUnit', width: 60, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '备注', dataIndex: 'errorDesc', width: 180, align: 'center', customRender: function (text) { return text || '--' } }
       ],
       loadData: [],

+ 2 - 9
src/views/allocationManagement/transferOut/edit.vue

@@ -150,12 +150,13 @@
         type="primary"
         id="allocateBillEdit-submit"
         size="large"
+        :disabled="spinning"
         class="button-primary"
         @click="handleSubmit"
         style="padding: 0 60px;">提交</a-button>
     </div>
     <!-- 导入产品 -->
-    <importGuideModal :openModal="openGuideModal" :params="importParams" @close="openGuideModal=false" @ok="hanldeOk" />
+    <importGuideModal :openModal="openGuideModal" :params="{allocateSn: $route.params.sn}" @close="openGuideModal=false" @ok="hanldeOk" />
     <!-- 打印 -->
     <div id="print"></div>
   </div>
@@ -237,14 +238,6 @@ export default {
       openGuideModal: false //  导入产品引导
     }
   },
-  computed: {
-    importParams () {
-      const obj = {
-        allocateSn: this.$route.params.sn
-      }
-      return obj
-    }
-  },
   methods: {
     //  重置
     resetSearchForm () {

+ 1 - 0
src/views/dealerManagement/merchantInfoManagement/edit.vue

@@ -374,6 +374,7 @@
       <a-button
         type="primary"
         class="button-primary"
+        :disabled="spinning"
         id="merchantInfoManagementEdit-submit-btn"
         size="large"
         @click="handleSubmit"

+ 1 - 0
src/views/productManagement/productInfo/edit.vue

@@ -201,6 +201,7 @@
       <a-button
         type="primary"
         class="button-primary"
+        :disabled="spinning"
         id="productInfoEdit-submit-btn"
         size="large"
         @click="handleSubmit"

+ 1 - 0
src/views/purchasingManagement/bulkWarehousingOrder/edit.vue

@@ -71,6 +71,7 @@
       <a-button
         type="primary"
         id="bulkWarehousingOrderEdit-submit"
+        :disabled="spinning"
         size="large"
         class="button-primary"
         @click="handleBack"

+ 1 - 0
src/views/salesManagement/salesQuery/edit.vue

@@ -136,6 +136,7 @@
       <a-button
         size="large"
         style="padding: 0 60px;"
+        :disabled="spinning"
         type="primary"
         class="button-primary"
         @click="handleSubmit()"

+ 1 - 0
src/views/salesManagement/salesReturn/salesReturnCheck.vue

@@ -44,6 +44,7 @@
       <a-button
         size="large"
         style="padding: 0 60px;"
+        :disabled="spinning"
         type="primary"
         class="button-primary"
         @click="handleSubmit()"

+ 1 - 0
src/views/salesManagement/salesReturn/salesReturnEdit.vue

@@ -73,6 +73,7 @@
       <a-button
         size="large"
         style="padding: 0 60px;"
+        :disabled="spinning"
         type="primary"
         class="button-primary"
         @click="handleSubmit()"

+ 1 - 0
src/views/salesManagement/salesReturn/salesReturnGrabEdit.vue

@@ -71,6 +71,7 @@
       <a-button
         size="large"
         style="padding: 0 60px;"
+        :disabled="spinning"
         type="primary"
         class="button-primary"
         @click="handleSubmit()"

+ 2 - 1
src/views/salesManagement/waitDispatch/edit.vue

@@ -98,7 +98,8 @@
     <div class="affix-cont">
       <a-button
         size="large"
-        style="width: 150px;"
+        style="padding: 0 60px;"
+        :disabled="spinning"
         type="primary"
         class="button-primary"
         @click="handleSubmit()"

+ 1 - 0
src/views/supplierManagement/supplierInfo/edit.vue

@@ -242,6 +242,7 @@
       <a-button
         type="primary"
         class="button-primary"
+        :disabled="spinning"
         id="supplierInfoEdit-submit-btn"
         size="large"
         @click="handleSubmit"