ソースを参照

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

# Conflicts:
#	src/views/reportData/salesReturnsReport/list.vue
bug
lilei 1 年間 前
コミット
ea37b76bb3

+ 2 - 2
src/views/productManagement/newProduct/list.vue

@@ -66,7 +66,7 @@
         </template>
         <!-- 上/下线时间 内容 -->
         <template slot="auditTime" slot-scope="text, record">
-          {{ $route.params.onlineFalg=='1'?record.onlineAuditTime:record.offlineAuditTime }}
+          {{ $route.params.onlineFalg=='1'?record.auditTime:record.auditTime }}
         </template>
         <!-- 产品分类 -->
         <template slot="productType" slot-scope="text, record">
@@ -149,7 +149,7 @@ export default {
         })
       },
       openModal: false, //  查看详情  弹框
-      itemId: '', //  当前产品productSn
+      itemId: '' //  当前产品productSn
     }
   },
   methods: {

+ 1 - 1
src/views/productManagement/newProduct/modal.vue

@@ -69,7 +69,7 @@ export default {
       if (this.onlineFalg == '1') {
         arr.push({ title: '上线时间', dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
       } else if (this.onlineFalg == '0') {
-        arr.push({ title: '下线时间', dataIndex: 'offlineAuditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
+        arr.push({ title: '下线时间', dataIndex: 'auditTime', width: 140, align: 'center', customRender: function (text) { return text || '--' } })
       }
       return arr
     }

+ 11 - 2
src/views/reportData/salesReturnsReport/list.vue

@@ -60,6 +60,11 @@
                     allowClear></v-select>
                 </a-form-model-item>
               </a-col>
+              <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货仓库">
+                  <chooseWarehouse ref="warehouse" isPermission v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             </template>
             <a-col :md="7" :sm="24" style="margin-bottom: 10px;">
               <a-button
@@ -124,13 +129,14 @@ import rangeDate from '@/views/common/rangeDate.vue'
 import subarea from '@/views/common/subarea.js'
 import dealerSubareaScopeList from '@/views/common/dealerSubareaScopeList.vue'
 import reportModal from '@/views/common/reportModal.vue'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import AreaList from '@/views/common/areaList.js'
 import { hdExportExcel } from '@/libs/exportExcel'
 import { reportSalesReturnList, reportSalesReturnCount, salesReturnsExport } from '@/api/reportData'
 export default {
   name: 'SalesReturnsReportList',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList },
+  components: { STable, VSelect, rangeDate, subarea, dealerSubareaScopeList, reportModal, AreaList, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -150,6 +156,7 @@ export default {
           subareaSn: undefined,
           subareaAreaSn: undefined
         },
+        warehouseSn: undefined,
         dealerSn: '',
         dealerLevel: undefined,
         dealerProvinceSn: undefined,
@@ -195,7 +202,8 @@ export default {
         { title: '退货类型', dataIndex: 'returnType', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '直接绑定客户名称', dataIndex: 'directDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '间接绑定客户名称', dataIndex: 'indirectDealerName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '退货数量', dataIndex: 'totalQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
+        { title: '退货数量', dataIndex: 'totalQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '退货仓库', dataIndex: 'warehouseName', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true }
         // { title: '开单退货金额', dataIndex: 'totalAmount', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '经销商价', dataIndex: 'totalWholesalePrice2', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '服务中心价', dataIndex: 'totalWholesalePrice1', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -304,6 +312,7 @@ export default {
       this.queryParam.subareaArea.subareaSn = undefined
       this.queryParam.subareaArea.subareaAreaSn = undefined
       this.queryParam.dealerSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.queryParam.dealerLevel = undefined
       this.queryParam.dealerProvinceSn = undefined
       this.queryParam.dealerCitySn = undefined

+ 1 - 1
src/views/reportData/urchaseDetailReturn/detailList.vue

@@ -60,7 +60,7 @@
               </a-col>
               <a-col :md="6" :sm="24">
                 <a-form-model-item label="出库仓库">
-                  <chooseWarehouse ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                  <chooseWarehouse isPermission ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
                 </a-form-model-item>
               </a-col>
               <a-col :md="6" :sm="24">

+ 10 - 1
src/views/reportData/urchaseReturn/list.vue

@@ -27,6 +27,11 @@
                 <supplier v-model="queryParam.supplierSn" isPermission placeholder="请输入供应商名称"></supplier>
               </a-form-model-item>
             </a-col>
+            <a-col :md="6" :sm="24">
+                <a-form-model-item label="退货仓库">
+                  <chooseWarehouse isPermission ref="warehouse" v-model="queryParam.warehouseSn"></chooseWarehouse>
+                </a-form-model-item>
+              </a-col>
             <a-col :md="6" :sm="24">
               <a-form-item label="退货原因">
                 <v-select
@@ -100,12 +105,13 @@ import { STable, VSelect } from '@/components'
 import rangeDate from '@/views/common/rangeDate.vue'
 import supplier from '@/views/common/supplier.js'
 import { hdExportExcel } from '@/libs/exportExcel'
+import chooseWarehouse from '@/views/common/chooseWarehouse'
 import reportModal from '@/views/common/reportModal.vue'
 import { sparePartsReturnReportList, sparePartsReturnReportStat, sparePartsReturnReportExport } from '@/api/reportData'
 export default {
   name: 'UrchaseReturn',
   mixins: [commonMixin],
-  components: { STable, VSelect, rangeDate, supplier, reportModal },
+  components: { STable, VSelect, rangeDate, supplier, reportModal, chooseWarehouse },
   data () {
     return {
       spinning: false,
@@ -121,6 +127,7 @@ export default {
         endDate: getDate.getCurrMonthDays().endtime,
         sparePartsReturnNo: undefined,
         supplierSn: undefined,
+        warehouseSn: undefined,
         returnReason: undefined
       },
       rules: {
@@ -155,6 +162,7 @@ export default {
         { title: '退货完成日期', dataIndex: 'auditDate', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '供应商名称', dataIndex: 'supplierName', width: 120, align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '退货原因', dataIndex: 'returnReasonDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '退货仓库', dataIndex: 'warehouseName', width: 150, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '补充说明', dataIndex: 'explainInfo', width: 120, align: 'center', customRender: function (text) { return text || '--' } },
         { title: '附件', width: 120, align: 'center', scopedSlots: { customRender: 'attachmentList' } },
         { title: '入库数量', dataIndex: 'totalPutQty', width: 90, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
@@ -231,6 +239,7 @@ export default {
       this.queryParam.endDate = getDate.getCurrMonthDays().endtime
       this.queryParam.sparePartsReturnNo = ''
       this.queryParam.supplierSn = undefined
+      this.queryParam.warehouseSn = undefined
       this.queryParam.returnReason = undefined
       this.totalData = null
       this.$refs.ruleForm.resetFields()

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

@@ -32,9 +32,9 @@
         <a-alert type="info" style="margin-bottom: 10px;" v-if="detailData!=null">
           <div slot="message">
             <span>
-              总数量:<strong>{{ countData.totalQty || countData.totalQty==0? countData.totalQty : '--' }}</strong>;
+              总款数:<strong>{{ countData.totalCategory || countData.totalCategory==0? countData.totalCategory : '--' }}</strong>;
             </span>
-            总款数:<strong>{{ countData.totalCategory || countData.totalCategory==0? countData.totalCategory : '--' }}</strong>;
+            总数量:<strong>{{ countData.totalQty || countData.totalQty==0? countData.totalQty : '--' }}</strong>;
           </div>
         </a-alert>
         <!-- 列表 -->

+ 1 - 1
src/views/salesManagement/salesOrderWarehouse/list.vue

@@ -60,7 +60,7 @@
       <!-- alert -->
       <a-alert type="info" style="margin-bottom:10px">
         <div slot="message">
-          总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '0' }}</strong>;
+          <!-- 总款数:<strong>{{ totalData&&(totalData.totalCategory || totalData.totalCategory==0) ? totalData.totalCategory : '0' }}</strong>; -->
           总数量:<strong>{{ totalData&&(totalData.totalQty || totalData.totalQty==0) ? totalData.totalQty : '--' }}</strong>;
         </div>
       </a-alert>

+ 20 - 8
src/views/salesManagement/sendOutOrder/detailModal.vue

@@ -62,7 +62,13 @@
             问题反馈:
             <div style="padding:0 10px;max-width: 60%;">
               <div v-if="showEditQus" style="width:400px;">
-                <a-textarea ref="issue" @blur="saveIssue" allowClear v-model="detail.issueRemark" placeholder="请输入问题反馈(最多100字符)" :maxLength="100" auto-size />
+                <a-textarea
+                  ref="issue"
+                  @blur="saveIssue"
+                  v-model="detail.issueRemark"
+                  placeholder="请输入问题反馈(最多100字符)"
+                  :maxLength="100"
+                  auto-size />
               </div>
               <div style="word-break: break-all;" v-else>{{ detail.issueRemark||'--' }}</div>
             </div>
@@ -80,7 +86,13 @@
         <a-button type="primary" @click="handleCommonOk">{{ okText }}</a-button>
       </div>
       <!-- 发货打印 -->
-      <commonModal modalTit="发货打印预览" width="700pt" okText="立即打印" :openModal="showTipModal" @cancel="showTipModal=false" @ok="$refs.printModel.printDom()">
+      <commonModal
+        modalTit="发货打印预览"
+        width="700pt"
+        okText="立即打印"
+        :openModal="showTipModal"
+        @cancel="showTipModal=false"
+        @ok="$refs.printModel.printDom()">
         <printModel ref="printModel" :detail="detail" @ok="printOk"></printModel>
       </commonModal>
     </a-spin>
@@ -170,19 +182,19 @@ export default {
       this.form.receiveDate = v ? moment() : ''
     },
     // 打印回调
-    printOk(res){
-      if(res){
+    printOk (res) {
+      if (res) {
         this.showTipModal = false
       }
     },
-    editIssue(){
+    editIssue () {
       this.showEditQus = !this.showEditQus
-      this.$nextTick(()=>{
+      this.$nextTick(() => {
         this.$refs.issue.focus()
       })
     },
-    saveIssue(){
-      updateIssueRemark({issueRemark: this.detail.issueRemark, sendBillSn: this.sendBillSn}).then(res => {
+    saveIssue () {
+      updateIssueRemark({ issueRemark: this.detail.issueRemark, sendBillSn: this.sendBillSn }).then(res => {
         this.showEditQus = false
       }).catch(res => {
         this.$refs.issue.focus()