瀏覽代碼

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

chenrui 1 年之前
父節點
當前提交
26d39b178d

二進制
public/templ/收货产品(不良品)模板.xlsx


二進制
public/templ/收货产品(良品)模板.xlsx


二進制
public/templ/销售退货(不良品)产品明细模板.xlsx


二進制
public/templ/销售退货(良品)产品明细模板.xlsx


+ 1 - 1
src/views/salesManagement/pushOrderManagement/sendTypeModal.vue

@@ -4,7 +4,7 @@
     :footer="null"
     :maskClosable="false"
     class="pushOrderManagement-print-type-modal"
-    title="发货分类打印"
+    :title="nowType=='print'?'发货分类打印':'发货分类导出'"
     v-model="isShow"
     @cancel="handleCancel"
     :width="600">

+ 6 - 4
src/views/salesManagement/sendOutOrder/detailModal.vue

@@ -53,14 +53,16 @@
             <span v-else>{{ detail.receiveDate||'--' }}</span>
           </div>
           <div style="flex-basis:30%" v-else></div>
-          <div style="flex-basis:30%">
+          <div style="flex-basis:30%;display:flex;">
             <label>物流备注:</label>
-            <a-textarea v-model="form.transportRemark" placeholder="请输入备注" v-if="type==0"/>
-            <span v-else>{{ detail.transportRemark||'--' }}</span>
+            <div style="padding:0 10px;max-width: 80%;">
+              <a-textarea style="width:300px;" v-model="form.transportRemark" :maxLength="100" placeholder="请输入备注(最多100字符)" v-if="type==0"/>
+              <span v-else>{{ detail.transportRemark||'--' }}</span>
+            </div>
           </div>
           <div style="flex-basis:60%;display:flex;" v-if="detail.receiveFlag == 1 && type!=0">
             问题反馈:
-            <div style="padding:0 10px;max-width: 60%;">
+            <div style="max-width: 60%;">
               <div v-if="showEditQus" style="width:400px;">
                 <a-textarea
                   ref="issue"

+ 4 - 4
src/views/salesReturnManagement/custConfirm/list.vue

@@ -127,7 +127,7 @@
             <a-input
               v-if="record.isEdit"
               size="small"
-              :maxlength="50"
+              :maxLength="50"
               v-model.trim="record.returnReasonRemarks"
               allowClear
               placeholder="请输入备注信息(最多50字符)"/>
@@ -213,7 +213,7 @@
         </div>
         <div style="line-height: 24px;margin-top:10px;" v-if="showEditRemarks">
           <div>备注</div>
-          <div><a-input size="large" :maxlength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
+          <div><a-input size="large" :maxLength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
         </div>
       </div>
     </commonModal>
@@ -371,7 +371,7 @@ export default {
       const a = this.$store.state.app.goodReturnReason.find(item => item.code == data.returnReasonCode)
       const b = this.$store.state.app.defectiveReturnReason.find(item => item.code == data.returnReasonCode)
       const goodFlag = a ? a.lookupCode : b.lookupCode
-      
+
       const params = {
         'salesReturnBillSn': this.orderSn,
         'salesReturnBillNo': this.ordeDetail.salesReturnBillNo,
@@ -430,7 +430,7 @@ export default {
           salesReturnBillSn: this.orderSn,
           returnReason: rows ? rows.dispName : '',
           returnReasonCode: this.plReturnReason,
-          returnReasonRemarks: this.plReturnRemark,
+          returnReasonRemarks: this.showEditRemarks ? this.plReturnRemark || '' : undefined,
           goodFlag: rows.lookupCode
         }).then(res => {
           if (res.status == 200) {

+ 1 - 1
src/views/salesReturnManagement/custConfirm/setPriceModal.vue

@@ -44,7 +44,7 @@
           </div>
           <div v-else>
             销售单号:
-            <a-input placeholder="请输入销售单号" v-model.trim="form.salesBillNo" :maxlength="50" @change="fetchUser"/>
+            <a-input placeholder="请输入销售单号" v-model.trim="form.salesBillNo" :maxLength="50" @change="fetchUser"/>
             <span class="mleft">{{ buyerName }}</span>
             <a-button type="primary" :disabled="disabled" @click="handleSave" class="button-error">设置完成</a-button>
           </div>

+ 30 - 24
src/views/salesReturnManagement/receiveCheck/checking.vue

@@ -7,7 +7,7 @@
           <a id="salesReturnCheck-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
           <span style="margin: 0 10px;color: #666;">
-            退货类别:{{ordeDetail&&ordeDetail.goodFlagDictValue}}
+            退货类别:{{ ordeDetail&&ordeDetail.goodFlagDictValue }}
           </span>
         </template>
       </a-page-header>
@@ -77,7 +77,12 @@
           </template>
           <!-- 备注 -->
           <template slot="remarksInfo" slot-scope="text, record">
-            <a-input size="small" v-model.trim="record.returnReasonRemarks" @blur="e => updateReason(e, record, 1)" :maxlength="50" allowClear placeholder="请输入备注信息(最多50字符)"/>
+            <a-input
+              size="small"
+              v-model.trim="record.returnReasonRemarks"
+              @blur="e => updateReason(e, record, 1)"
+              :maxLength="50"
+              placeholder="请输入备注信息(最多50字符)"/>
           </template>
         </s-table>
         <div class="footer-btn">
@@ -96,19 +101,19 @@
     <chooseTypeModal :openModal="openTypeModal" :type="actionType" @close="openTypeModal=false" @confirm="plconfirm"></chooseTypeModal>
     <!-- 批量设置退货原因 -->
     <commonModal modalTit="批量设置退货原因" :openModal="showPlModal" @cancel="showPlModal=false" @ok="setPlReturnReason">
-       <div style="text-align: left;">
-         <div style="line-height: 24px;">
-           <div><span style="color:red;">*</span>退货原因</div>
-           <div><returnReason size="large" v-model="plReturnReason"></returnReason></div>
-         </div>
-         <div style="line-height: 24px;margin-top:10px;">
-           <a-checkbox :checked="showEditRemarks" @change="e => showEditRemarks=!showEditRemarks">是否设置备注</a-checkbox>
-         </div>
-         <div style="line-height: 24px;margin-top:10px;" v-if="showEditRemarks">
-           <div>备注</div>
-           <div><a-input size="large" :maxlength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
-         </div>
-       </div>
+      <div style="text-align: left;">
+        <div style="line-height: 24px;">
+          <div><span style="color:red;">*</span>退货原因</div>
+          <div><returnReason size="large" v-model="plReturnReason"></returnReason></div>
+        </div>
+        <div style="line-height: 24px;margin-top:10px;">
+          <a-checkbox :checked="showEditRemarks" @change="e => showEditRemarks=!showEditRemarks">是否设置备注</a-checkbox>
+        </div>
+        <div style="line-height: 24px;margin-top:10px;" v-if="showEditRemarks">
+          <div>备注</div>
+          <div><a-input size="large" :maxLength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
+        </div>
+      </div>
     </commonModal>
   </div>
 </template>
@@ -171,6 +176,7 @@ export default {
               data.list[i].goodQtyBackups = data.list[i].goodQty
               data.list[i].backStockQtyBackups = data.list[i].backStockQty
               data.list[i].returnReasonBackups = data.list[i].returnReason
+              data.list[i].bakReamrks = data.list[i].returnReasonRemarks
             }
             this.disabled = false
             this.chooseLoadData = data.list
@@ -196,7 +202,7 @@ export default {
     }
   },
   computed: {
-    goodFlag() {
+    goodFlag () {
       return this.ordeDetail && this.ordeDetail.goodFlag || ''
     },
     selNums () {
@@ -313,10 +319,10 @@ export default {
         })
         salesReturnDetailSetReason({
           salesReturnBillDetailSnList: snList,
-          salesReturnBillSn : this.orderSn,
+          salesReturnBillSn: this.orderSn,
           returnReason: rows ? rows.dispName : '',
           returnReasonCode: this.plReturnReason,
-          returnReasonRemarks: this.plReturnRemark,
+          returnReasonRemarks: this.showEditRemarks ? this.plReturnRemark || '' : undefined,
           goodFlag: rows.lookupCode
         }).then(res => {
           if (res.status == 200) {
@@ -334,15 +340,15 @@ export default {
         salesReturnDetailSn: record.salesReturnDetailSn
       }
       // 退货原因
-      if(type == 0){
+      if (type == 0) {
         const rows = this.returnReasonlist.find(item => item.code == val)
-        params.returnReasonCode = val||''
+        params.returnReasonCode = val || ''
         params.returnReason = rows ? rows.dispName : ''
         params.goodFlag = rows.lookupCode
-      }else{
+      } else {
         // 备注
         params.returnReasonRemarks = val.target.value
-        if(!params.returnReasonRemarks){
+        if (params.returnReasonRemarks == record.bakReamrks) {
           return
         }
       }
@@ -414,8 +420,8 @@ export default {
     getOrderDetail () {
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
-        if(res.data){
-          this.returnReasonlist = [...this.$store.state.app.goodReturnReason,...this.$store.state.app.defectiveReturnReason]
+        if (res.data) {
+          this.returnReasonlist = [...this.$store.state.app.goodReturnReason, ...this.$store.state.app.defectiveReturnReason]
         }
       })
     },

+ 3 - 2
src/views/salesReturnManagement/receiveCheck/receiving.vue

@@ -7,7 +7,7 @@
           <a id="salesReturnReceive-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
           <span style="margin: 0 10px;color: #666;">
-            退货类别:{{ordeDetail&&ordeDetail.goodFlagDictValue}}
+            退货类别:{{ ordeDetail&&ordeDetail.goodFlagDictValue }}
           </span>
         </template>
       </a-page-header>
@@ -183,6 +183,7 @@ export default {
               data.list[i].receiveQtyBackups = data.list[i].receiveQty
               data.list[i].initialQtyBackups = data.list[i].initialQty
               data.list[i].returnReasonBackups = data.list[i].returnReason
+              data.list[i].bakReamrks = data.list[i].returnReasonRemarks
             }
             this.disabled = false
             this.chooseLoadData = data.list
@@ -366,7 +367,7 @@ export default {
       } else {
         // 备注
         params.returnReasonRemarks = val.target.value
-        if (!params.returnReasonRemarks) {
+        if (params.returnReasonRemarks == record.bakReamrks) {
           return
         }
       }

+ 14 - 13
src/views/salesReturnManagement/salesReturn/salesReturnEdit.vue

@@ -7,10 +7,10 @@
           <a id="salesReturnEdit-back-btn" href="javascript:;" @click="handleBack"><a-icon type="left" /> 返回列表</a>
           <span style="margin: 0 15px;color: #666;">客户名称:{{ ordeDetail&&ordeDetail.buyerName || '--' }}</span>
           <span style="margin: 0 10px;color: #666;">
-            退货仓库:{{ordeDetail&&ordeDetail.warehouseName}}
+            退货仓库:{{ ordeDetail&&ordeDetail.warehouseName }}
           </span>
           <span style="margin: 0 10px;color: #666;">
-            退货类别:{{ordeDetail&&ordeDetail.goodFlagDictValue}}
+            退货类别:{{ ordeDetail&&ordeDetail.goodFlagDictValue }}
           </span>
         </template>
         <!-- 操作区,位于 title 行的行尾 -->
@@ -155,7 +155,7 @@
         </div>
         <div style="line-height: 24px;margin-top:10px;" v-if="showEditRemarks">
           <div>备注</div>
-          <div><a-input size="large" :maxlength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
+          <div><a-input size="large" :maxLength="50" placeholder="请输入备注(最多50字符)" v-model="plReturnRemark"></a-input></div>
         </div>
       </div>
     </commonModal>
@@ -237,6 +237,7 @@ export default {
               data.list[i].no = no + i + 1
               data.list[i].qtyBackups = data.list[i].initialQty
               data.list[i].returnReasonBackups = data.list[i].returnReasonCode
+              data.list[i].bakReamrks = data.list[i].returnReasonRemarks
             }
             this.disabled = false
             this.chooseLoadData = data.list
@@ -252,7 +253,7 @@ export default {
       plReturnRemark: undefined,
       showEditRemarks: false,
       showPlModal: false,
-      returnReasonlist: [],
+      returnReasonlist: []
     }
   },
   watch: {
@@ -265,7 +266,7 @@ export default {
     }
   },
   computed: {
-    goodFlag() {
+    goodFlag () {
       return this.ordeDetail && this.ordeDetail.goodFlag || ''
     },
     selNums () {
@@ -344,14 +345,14 @@ export default {
         goodFlag: this.goodFlag
       }
       // 退货原因
-      if(type == 0){
+      if (type == 0) {
         const rows = this.returnReasonlist.find(item => item.code == val)
-        params.returnReasonCode = val||''
+        params.returnReasonCode = val || ''
         params.returnReason = rows ? rows.dispName : ''
-      }else{
+      } else {
         // 备注
         params.returnReasonRemarks = val.target.value
-        if(!params.returnReasonRemarks){
+        if (params.returnReasonRemarks == record.bakReamrks) {
           return
         }
       }
@@ -387,10 +388,10 @@ export default {
         })
         salesReturnDetailSetReason({
           salesReturnBillDetailSnList: snList,
-          salesReturnBillSn : this.$route.params.sn,
+          salesReturnBillSn: this.$route.params.sn,
           returnReason: rows ? rows.dispName : '',
           returnReasonCode: this.plReturnReason,
-          returnReasonRemarks: this.plReturnRemark
+          returnReasonRemarks: this.showEditRemarks ? this.plReturnRemark || '' : undefined
         }).then(res => {
           if (res.status == 200) {
             this.showPlModal = false
@@ -405,11 +406,11 @@ export default {
     getOrderDetail (flag) {
       salesReturnDetail({ sn: this.orderSn }).then(res => {
         this.ordeDetail = res.data || null
-        if(res.data.goodFlag == 'DEFECTIVE_PRODUCT_RETURN'){
+        if (res.data.goodFlag == 'DEFECTIVE_PRODUCT_RETURN') {
           this.returnReasonlist = this.$store.state.app.defectiveReturnReason
         }
         // 良品
-        if(res.data.goodFlag == 'GOOD_PRODUCT_RETURN'){
+        if (res.data.goodFlag == 'GOOD_PRODUCT_RETURN') {
           this.returnReasonlist = this.$store.state.app.goodReturnReason
         }
         this.$refs.table.refresh(!flag)