소스 검색

修改bug

chenrui 2 년 전
부모
커밋
e7cbfba64b

BIN
public/templ/销售导入产品模板.xlsx


+ 2 - 2
src/views/salesManagement/salesQuery/detail.vue

@@ -411,11 +411,11 @@ export default {
       salesWriteAuditPush(params).then(res => {
         if (res.status == 200) {
           this.$message.success(res.message)
-          this.spinningAudit = false
-          this.spinning = false
           //  关闭详情跳列表
           this.handleBack()
         }
+        this.spinningAudit = false
+        this.spinning = false
       })
     },
     // 审核

+ 21 - 15
src/views/salesManagement/salesQuery/importGuideModal.vue

@@ -18,8 +18,13 @@
             <li>1) 导入的Excel文件中必须包含名为“产品编码”、“数量”的列,且名称必须相同</li>
             <li>2) 除了“产品编码”、“数量”两列,其他列可自定义,不影响数据导入</li>
             <li>3) 如果导入的产品已经存在,则不会导入该行</li>
+            <li>
+              <a :href="filePath" style="margin: 5px 0 0;display: block;">
+                <a-icon type="download" style="padding-right: 5px;" />下载导入模板
+              </a>
+            </li>
           </ul>
-          <a-button type="link" icon="download" style="padding: 0 0 0 23px;" :loading="exportLoading" @click="handleExport">下载导入模板</a-button>
+          <!-- <a-button type="link" icon="download" style="padding: 0 0 0 23px;" :loading="exportLoading" @click="handleExport">下载导入模板</a-button> -->
         </div>
         <div class="explain-item">
           <div class="explain-tit">
@@ -91,7 +96,8 @@ export default {
       uploadParams: {
         savePathType: 'local'
       },
-      exportLoading: false
+      exportLoading: false,
+      filePath: location.protocol + '//' + location.host + '/templ/销售导入产品模板.xlsx'
     }
   },
   methods: {
@@ -123,20 +129,20 @@ export default {
     handleClose () {
       this.openImportModal = false
       this.isShow = false
-    },
-    //  导出
-    handleExport () {
-      const _this = this
-      const params = { grabFlag: this.params.grabFlag }
-      this.exportLoading = true
-      this.spinning = true
-      setTimeout(() => {
-        _this.exportLoading = false
-      }, 1000)
-      hdExportExcel(salesDownload, params, '销售导入模板', function () {
-        _this.spinning = false
-      })
     }
+    //  导出
+    // handleExport () {
+    //   const _this = this
+    //   const params = { grabFlag: this.params.grabFlag }
+    //   this.exportLoading = true
+    //   this.spinning = true
+    //   setTimeout(() => {
+    //     _this.exportLoading = false
+    //   }, 1000)
+    //   hdExportExcel(salesDownload, params, '销售导入模板', function () {
+    //     _this.spinning = false
+    //   })
+    // }
   },
   watch: {
     //  父页面传过来的弹框状态

+ 2 - 2
src/views/salesManagement/salesQuery/list.vue

@@ -164,8 +164,8 @@
         <template slot="warehouseBox" slot-scope="text, record">
           <a-tooltip placement="right" v-if="record.warehouseNameSet && record.warehouseNameSet.length>0">
             <template slot="title">
-              <div class="warehouse_box">
-                <span v-for="(item,i) in record.warehouseNameSet" :key="i">{{ item }}</span>
+              <div class="warehouse_box1">
+                <span v-for="(item,i) in record.warehouseNameSet" :key="i">{{ item }},</span>
               </div>
             </template>
             <div class="warehouse_box">

+ 2 - 2
src/views/salesManagement/salesQuery/setPriceModal.vue

@@ -16,10 +16,10 @@
           <div style="margin-bottom:10px;font-weight:bold;">销售单部分产品价格发生变更,请确认</div>
           <a-radio-group v-model="priceVal">
             <a-radio value="0" :style="radioStyle">
-              以订单当前价格为准
+              以订单当前价格为准,总金额:100元
             </a-radio>
             <a-radio value="1" :style="radioStyle">
-              以OCS最新价格为准
+              以OCS最新价格为准,总金额:100元
             </a-radio>
           </a-radio-group>
         </div>

+ 1 - 1
src/views/salesManagement/waitDispatch/queryPart.vue

@@ -45,7 +45,7 @@
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="出库仓库">
-              <chooseWarehouse ref="warehouse" :allowClear="false" v-model="queryParam.warehouseSn"></chooseWarehouse>
+              <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24" style="margin-bottom: 10px;">