Ver Fonte

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

chenrui há 2 anos atrás
pai
commit
fb6085302e

+ 1 - 1
public/version.json

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

+ 2 - 2
src/store/modules/app.js

@@ -162,12 +162,12 @@ const app = {
         }
       })
     },
-    getReturnReasonData({ commit }, code, isEnable) {
+    getReturnReasonData({ commit }, code) {
       getLookUpData({
         pageNo: 1,
         pageSize: 1000,
         lookupCode: code,
-        isEnable: isEnable ? 1 : undefined
+        isEnable: 1
       }).then(res => {
         if (res.status == 200) {
           commit('SET_returnReason', res.data.list)

+ 6 - 6
src/views/Home.vue

@@ -109,12 +109,12 @@ export default {
       }
       vm.getReturnReasonData('RETURN_REASON')
       vm.getYyMenuList()
-      vm.$store.state.app.priceAuthOptions=[
-        {label:'售价',value:'salesPrice'},
-        {label:'成本价',value:'costPrice'},
-        {label:'省级价',value:'provincePrice'},
-        {label:'市级价',value:'cityPrice'},
-        {label:'特约价',value:'specialPrice'}
+      vm.$store.state.app.priceAuthOptions = [
+        { label: '售价', value: 'salesPrice' },
+        { label: '成本价', value: 'costPrice' },
+        { label: '省级价', value: 'provincePrice' },
+        { label: '市级价', value: 'cityPrice' },
+        { label: '特约价', value: 'specialPrice' }
       ]
     })
   }

+ 1 - 1
src/views/expenseManagement/expenseReimbursement/detail.vue

@@ -186,7 +186,7 @@ export default {
         this.$refs.printModal.setData([{
           expenseInfo: this.detailData,
           fyListData,
-          spListData
+          spListData:spListData||[]
         }])
         // 立即打印
         if(type == 'print'){

+ 4 - 2
src/views/expenseManagement/expenseReimbursement/list.vue

@@ -307,8 +307,10 @@ export default {
       // 获取审核进度信息
       const spListData = await getBatchLastProcessInstance({ 'businessType': 'EXPENSES', 'businessSnList': businessSnList }).then(res => res.data)
       pageData.map(item => {
-        const sp = spListData[item.expenseInfo.expenseAccountSn]
-        item.spListData = sp ? sp.taskVOList : []
+        if(spListData){
+          const sp = spListData[item.expenseInfo.expenseAccountSn]
+          item.spListData = sp ? sp.taskVOList : []
+        }
       })
       console.log(pageData)
       // 打开预览弹框

+ 2 - 0
src/views/financialManagement/financialCollection/edit.vue

@@ -170,6 +170,7 @@
       modalTit="选择销售单"
       :loading="spinning"
       :dealerSn="detailData&&detailData.dealerSn"
+      :payerType="detailData&&detailData.payerType"
       :chooseData="glList"
       :openModal="showGlSalseModal"
       @choose="addGlOrder"
@@ -179,6 +180,7 @@
       modalTit="选择调拨单"
       :loading="spinning"
       :dealerSn="detailData&&detailData.dealerSn"
+      :payerType="detailData&&detailData.payerType"
       :chooseData="glList"
       :openModal="showGlAllocaModal"
       @choose="addGlOrder"

+ 5 - 1
src/views/financialManagement/financialCollection/selectGlAllocatModal.vue

@@ -117,6 +117,10 @@ export default {
       type: Boolean,
       default: false
     },
+    payerType:{
+      type: String,
+      default: ''
+    },
     dealerSn: {
       type: String,
       default: null
@@ -139,7 +143,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam, {authFlag:0})).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, {authFlag:this.payerType=='DEALER'?1:0})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 5 - 1
src/views/financialManagement/financialCollection/selectGlSalesModal.vue

@@ -127,6 +127,10 @@ export default {
         return []
       }
     },
+    payerType:{
+      type: String,
+      default: ''
+    },
     loading: {
       type: Boolean,
       default: false
@@ -155,7 +159,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return dispatchlList(Object.assign(parameter, this.queryParam, {authFlag:0})).then(res => {
+        return dispatchlList(Object.assign(parameter, this.queryParam, {authFlag:this.payerType=='DEALER'?1:0})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 1 - 1
src/views/reportData/allocationDetails/list.vue

@@ -253,7 +253,7 @@ export default {
         { title: '客户级别', dataIndex: 'dealerLevelDictValue', width: 120, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '品牌', dataIndex: 'productBrandName', width: 130, align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '二级分类', dataIndex: 'productTypeName2', width: 130, align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'productName', align: 'left', sorter: true, customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '产品名称', dataIndex: 'productName', width: 260, align: 'left', sorter: true, customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '产品编码', dataIndex: 'productCode', width: 150, align: 'center', sorter: true, customRender: function (text) { return text || '--' } },
         { title: '调拨数量', dataIndex: 'qty', width: 70, align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'productUnit', width: 50, align: 'center', customRender: function (text) { return text || '--' } },

+ 4 - 4
src/views/reportData/salesReturnsReport/list.vue

@@ -93,8 +93,8 @@
             <a-col :md="4" :sm="24">总数量:{{ (totalData && (totalData.totalQty || totalData.totalQty==0)) ? totalData.totalQty : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_salesPrice')">开单退货金额:{{ (totalData && (totalData.totalAmount || totalData.totalAmount==0)) ? toThousands(totalData.totalAmount) : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_salesPrice')">实售退货金额:{{ (totalData && (totalData.totalRealAmount || totalData.totalRealAmount==0)) ? toThousands(totalData.totalRealAmount) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_provincePrice')">经销商金额:{{ (totalData && (totalData.totalWholesalePrice2 || totalData.totalWholesalePrice2==0)) ? toThousands(totalData.totalWholesalePrice2) : '--' }}</a-col>
-            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_cityPrice')">服务中心金额:{{ (totalData && (totalData.totalWholesalePrice1 || totalData.totalWholesalePrice1==0)) ? toThousands(totalData.totalWholesalePrice1) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_cityPrice')">经销商金额:{{ (totalData && (totalData.totalWholesalePrice2 || totalData.totalWholesalePrice2==0)) ? toThousands(totalData.totalWholesalePrice2) : '--' }}</a-col>
+            <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_provincePrice')">服务中心金额:{{ (totalData && (totalData.totalWholesalePrice1 || totalData.totalWholesalePrice1==0)) ? toThousands(totalData.totalWholesalePrice1) : '--' }}</a-col>
             <a-col :md="4" :sm="24" v-if="$hasPermissions('M_salesReturnsReportList_specialPrice')">特约加盟店金额:{{ (totalData && (totalData.totalWholesalePrice3 || totalData.totalWholesalePrice3==0)) ? toThousands(totalData.totalWholesalePrice3) : '--' }}</a-col>
           </a-row>
         </template>
@@ -195,10 +195,10 @@ export default {
       if (this.$hasPermissions('M_salesReturnsReportList_salesPrice')) { //  售价权限
         arr.push({ title: '开单退货金额', dataIndex: 'totalAmount', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('M_salesReturnsReportList_provincePrice')) {
+      if (this.$hasPermissions('M_salesReturnsReportList_cityPrice')) {
         arr.push({ title: '经销商价', dataIndex: 'totalWholesalePrice2', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
-      if (this.$hasPermissions('M_salesReturnsReportList_cityPrice')) {
+      if (this.$hasPermissions('M_salesReturnsReportList_provincePrice')) {
         arr.push({ title: '服务中心价', dataIndex: 'totalWholesalePrice1', width: 90, align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       if (this.$hasPermissions('M_salesReturnsReportList_specialPrice')) {

+ 6 - 4
src/views/salesManagement/salesCollection/voucherModal.vue

@@ -82,7 +82,9 @@
       </div>
     </a-spin>
     <!-- 收款打印 -->
-    <printModel ref="printModel" @cancel="canselPrintView"></printModel>
+    <commonModal modalTit="收款打印预览" width="700pt" :showFooter="false" :openModal="showTipModal" @cancel="canselPrintView">
+      <printModel ref="printModel" @cancel="canselPrintView" @ok="canselPrintView"></printModel>
+    </commonModal>
     <!-- 查看财务收款详情 -->
     <commonModal
       modalTit="财务收款详情"
@@ -196,7 +198,7 @@ export default {
       }
       return auditStr
     },
-    // 批量打印
+    // 收款打印
     async handlePlPrint () {
       this.spinning = true
       let rows = []
@@ -233,7 +235,7 @@ export default {
       this.handlePrint(retArr, rows)
     },
     // 收款打印
-    async handlePrint (row, list) {
+    handlePrint (row, list) {
       this.spinning = true
       this.showTipModal = true
       this.$nextTick(() => {
@@ -242,8 +244,8 @@ export default {
       })
     },
     canselPrintView () {
-      this.showTipModal = false
       this.spinning = false
+      this.showTipModal = false
       this.$refs.printModel.clearData()
     },
     // 取消

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

@@ -114,13 +114,13 @@ export default {
         { title: '销售数量', dataIndex: 'qty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         // { title: '销售价', dataIndex: 'price', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         // { title: '销售金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '缺货数量', dataIndex: 'lackQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '缺货金额', dataIndex: 'lackAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '缺货数量', dataIndex: 'lackQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } }
       ]
       
       if (this.$hasPermissions('B_salesDetail_salesPrice')) { // 售价权限
         arr.splice(6, 0, { title: '销售价', dataIndex: 'price', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
         arr.splice(7, 0, { title: '销售金额', dataIndex: 'totalAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(8, 0, { title: '缺货金额', dataIndex: 'lackAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
       return arr
     }

+ 4 - 4
src/views/setting/erpMessageManagement/list.vue

@@ -11,13 +11,13 @@
               </a-form-item>
             </a-col>
             <a-col :md="6" :sm="24">
-              <a-form-item label="同步状态">
-                <a-select placeholder="请选择同步状态" v-model="queryParam.handleResult">
+              <a-form-item label="处理状态">
+                <a-select placeholder="请选择处理状态" v-model="queryParam.handleResult">
                   <a-select-option value="finish">
-                    同步成功
+                    处理成功
                   </a-select-option>
                   <a-select-option value="fail">
-                    同步失败
+                    处理失败
                   </a-select-option>
                 </a-select>
               </a-form-item>