Przeglądaj źródła

Merge branch 'develop_yh7' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_yh7

chenrui 2 lat temu
rodzic
commit
d88249a610

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
-    "version": "2.1.60",
+    "version": "2.1.62",
     "message": "发现有新版本发布,确定更新系统?"
 }

+ 10 - 6
src/views/salesManagement/pushOrderManagement/explainInfoModal.vue

@@ -9,11 +9,13 @@
     @cancel="handleCancel"
     :width="600">
     <a-spin :spinning="spinning" tip="Loading...">
-      <div style="min-height:100px;">
+      <div>
         <div v-if="infoList.length">
-          <div class="infoList-item" v-for="item in infoList" :key="item.id">
-            <div><strong>{{ item.createDate }}</strong></div>
-            <div>{{ item.explainInfo }}</div>
+          <div style="min-height:100px;max-height:400px;overflow:auto;">
+            <div class="infoList-item" v-for="item in infoList" :key="item.id">
+              <div><strong>{{ item.createDate }}</strong></div>
+              <div>{{ item.explainInfo }}</div>
+            </div>
           </div>
           <div class="info-new" v-if="!showInput && mode=='edit'">
             <a-button type="primary" @click="showInput=true" size="small" ghost block>+新增发货说明</a-button>
@@ -32,7 +34,7 @@
           暂无发货说明
         </div>
       </div>
-      <div class="btn-cont" v-if="mode=='edit'">
+      <div class="btn-cont" v-if="mode=='edit'&&showInput">
         <a-button @click="handleCancel">取消</a-button>
         <a-button
           type="primary"
@@ -100,6 +102,7 @@ export default {
       this.spinning = true
       queryExplainList({ dispatchBillSn: this.rowData.dispatchBillSn }).then(res => {
         this.infoList = res.data || []
+        this.showInput = !this.infoList.length
         this.spinning = false
       })
     },
@@ -108,6 +111,7 @@ export default {
       this.isShow = false
       this.explainInfo = ''
       this.infoList = []
+      this.showInput = false
     }
   },
   watch: {
@@ -131,7 +135,7 @@ export default {
   .pushOrderManagement-explainInfo-modal{
     .btn-cont {
       text-align: center;
-      margin: 35px 0 10px;
+      margin: 25px 0 10px;
     }
     .infoList-item{
       padding: 10px 0;

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

@@ -336,7 +336,7 @@ export default {
     handleBatchDel () {
       const _this = this
       if (!_this.rowSelectionInfo || (_this.rowSelectionInfo && _this.rowSelectionInfo.selectedRowKeys.length < 1)) {
-        _this.$message.warning('请选择要删除的产品后再进行批量操作!')
+        _this.$message.warning('请选择要删除的产品后再进行批量操作!')
         return
       }
       const obj = []

+ 3 - 2
src/views/salesManagement/stockPrint/list.vue

@@ -123,7 +123,8 @@
           </template>
           <!-- 发货说明  -->
           <template slot="explainInfo" slot-scope="text, record">
-            <span class="link-bule" @click="handleExplainInfo(record)" :title="record.explainInfo">{{ record.explainInfo||'--' }}</span>
+            <span v-if="record.explainInfo" class="link-bule" @click="handleExplainInfo(record)" :title="record.explainInfo">{{ record.explainInfo||'--' }}</span>
+            <span v-else>--</span>
           </template>
           <!-- 备货打印状态 -->
           <template slot="printStatus" slot-scope="text, record">
@@ -173,7 +174,7 @@
           <dispatchDetail v-if="detailType==1" ref="dispatchDetail" :bizSn="bizSn"></dispatchDetail>
         </commonModal>
         <!-- 操作提示 -->
-        <commonModal modalTit="操作提示" :openModal="showPrintModal" @cancel="canselModal" @ok="updatePrintStatus">
+        <commonModal modalTit="操作提示" okText="暂不打印" :openModal="showPrintModal" @cancel="canselModal" @ok="updatePrintStatus">
           <div style="text-align: center;">
             <div style="margin-bottom: 15px;font-size: 14px;">如需将打印状态回退至<strong>【暂不打印】</strong>,请点击下方按钮</div>
             <div style="line-height: 24px;">

+ 2 - 2
vue.config.js

@@ -107,9 +107,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        // target: 'http://192.168.0.183:8602/ocs-admin',
+        target: 'http://192.168.0.183:8602/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  Á·Ï°
-        target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
+        // target: 'http://p.ocs.360arrow.com/ocs-admin', //  Ô¤·¢²¼
         ws: false,
         changeOrigin: true,
         pathRewrite: {