瀏覽代碼

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

# Conflicts:
#	vue.config.js
lilei 1 年之前
父節點
當前提交
d41dae312e

+ 1 - 1
public/version.json

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

+ 1 - 1
src/views/allocationManagement/matchSendOutOrder/list.vue

@@ -157,7 +157,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag:1})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 8 - 2
src/views/allocationManagement/transferOut/basicInfoModal.vue

@@ -48,7 +48,9 @@
           <a-col :md="12" :sm="24" v-if="!isEdit">
             <a-form-model-item label="调出仓库" prop="warehouseSn">
               <warehouse
+                isPermission
                 v-model="form.warehouseSn"
+                ref="warehouse"
                 id="allocateBill-basicInfo-warehouseSn"
                 placeholder="请选择调出仓库"
               />
@@ -253,9 +255,13 @@ export default {
     // 调往对象名称经销商  change
     handleChange (value) {
       const ind = this.dealerData.findIndex(item => item.dealerSn == value)
-      console.log(this.dealerData[ind])
       this.form.targetName = this.dealerData[ind].dealerName
-      this.form.warehouseSn = this.dealerData[ind].defaultWarehouseSn
+      const wsn = this.dealerData[ind].defaultWarehouseSn
+      if(this.$refs.warehouse.hasWarehouse(wsn)){
+        this.form.warehouseSn = wsn
+      }else{
+        this.form.warehouseSn = undefined
+      }
     },
     //  保存
     handleSave () {

+ 2 - 1
src/views/allocationManagement/transferOut/list.vue

@@ -46,6 +46,7 @@
               <a-col :md="6" :sm="24">
                 <a-form-item label="调出仓库">
                   <warehouse
+                    isPermission
                     v-model="queryParam.warehouseSn"
                     id="allocateBillList-warehouseSn"
                     placeholder="请选择调出仓库"
@@ -237,7 +238,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag: 0})).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag:1})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data

+ 7 - 11
src/views/allocationManagement/transfersPrint/list.vue

@@ -232,7 +232,7 @@ export default {
       loadData: parameter => {
         this.disabled = true
         this.spinning = true
-        return allocateBillList(Object.assign(parameter, this.queryParam)).then(res => {
+        return allocateBillList(Object.assign(parameter, this.queryParam, {authWarehouseFlag:1})).then(res => {
           let data
           if (res.status == 200) {
             data = res.data
@@ -258,15 +258,11 @@ export default {
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
         { title: '创建时间', dataIndex: 'createDate', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '调拨单号', scopedSlots: { customRender: 'allocateNo' }, align: 'center', width: '10%' },
-        { title: '调往对象', dataIndex: 'targetName', width: '10%', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '调往对象', dataIndex: 'targetName', width: '12%', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '发货编号', dataIndex: 'sendNo', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '发货说明', dataIndex: 'explainInfo', width: '8%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '收货客户名称', dataIndex: 'receiverName', width: '8%', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '总数量', dataIndex: 'totalQty', width: '5%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '业务状态', dataIndex: 'stateDictValue', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '打印状态', scopedSlots: { customRender: 'printStatus' }, width: '6%', align: 'center' },
         { title: '允许打印时间', dataIndex: 'allowPrintTime', width: '7%', align: 'center', customRender: function (text) { return text || '--' } },
@@ -274,14 +270,14 @@ export default {
         { title: '操作', scopedSlots: { customRender: 'action' }, width: '8%', align: 'center' }
       ]
       if (this.isShowWarehouse) {
-        arr.splice(4, 0, { title: '调出仓库', dataIndex: 'warehouseName', width: '6%', align: 'center', customRender: function (text) { return text || '--' } })
+        arr.splice(4, 0, { title: '调出仓库', dataIndex: 'warehouseName', width: '5%', align: 'center', customRender: function (text) { return text || '--' } })
       }
 
       if (this.$hasPermissions('M_transfersPrintList_salesPrice')) { //  售价权限
-        arr.splice(9, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '90px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(10, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '80px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(11, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '70px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
-        arr.splice(12, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '70px', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(9, 0, { slots: { title: 'costTitle' }, dataIndex: 'receiveTotalAmount', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(10, 0, { title: '易损件售价', dataIndex: 'receiveYsjTotalAmount', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(11, 0, { title: '电池售价', dataIndex: 'receiveDcTotalAmount', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
+        arr.splice(12, 0, { title: '机油售价', dataIndex: 'receiveJyTotalAmount', width: '5%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } })
       }
 
       return arr

+ 3 - 0
src/views/common/chooseWarehouse.js

@@ -109,6 +109,9 @@ const warehouse = {
         }
       })
     },
+    hasWarehouse(){
+      return this.warehouseData.find(item => item.warehouseSn == sn)
+    },
     clearData () {
       this.handleChange([])
     }

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

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

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

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

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

@@ -114,7 +114,7 @@ export default {
         id: 'all',
         orderBy: undefined,
         origCode: '0',
-        packNo: '0'
+        packNo: '1'
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
@@ -168,7 +168,7 @@ export default {
       this.form.id = 'all'
       this.form.orderBy = undefined
       this.form.origCode = '0'
-      this.form.packNo = '0'
+      this.form.packNo = '1'
     },
     // 获取该销售单产品二级分类
     getTypeData (dispatchBillSn) {

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

@@ -276,8 +276,8 @@ export default {
         { title: '备货单号', scopedSlots: { customRender: 'dispatchBillNo' }, width: '120px', align: 'center' },
         { title: '发货编号', dataIndex: 'sendNo', width: '40px', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '发货说明', scopedSlots: { customRender: 'explainInfo' }, width: '80px', align: 'center', ellipsis: true },
-        { title: '客户名称', dataIndex: 'buyerName', width: '100px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '收货客户名称', dataIndex: 'receiverName', width: '100px', align: 'left', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '客户名称', dataIndex: 'buyerName', width: '130px', align: 'left', customRender: function (text) { return text || '--' } },
+        { title: '收货客户名称', dataIndex: 'receiverName', width: '130px', align: 'left', customRender: function (text) { return text || '--' } },
         { title: '产品款数', dataIndex: 'totalCategory', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '产品数量', dataIndex: 'totalQty', width: '60px', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '仓库', dataIndex: 'warehouseName', width: '80px', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },

+ 2 - 1
src/views/salesManagement/stockPrint/sendTypeModal.vue

@@ -108,7 +108,7 @@ export default {
         id: 'all',
         orderBy: undefined,
         origCode: '0',
-        packNo: '0'
+        packNo: '1'
       },
       rules: {
         id: [{ required: true, message: '请选择产品分类', trigger: 'change' }],
@@ -161,6 +161,7 @@ export default {
       this.$refs.ruleForm.resetFields()
       this.form.id = 'all'
       this.form.orderBy = undefined
+      this.form.packNo = '1'
     },
     // 获取该销售单产品二级分类
     getTypeData (dispatchBillSn) {

+ 2 - 2
vue.config.js

@@ -108,9 +108,9 @@ const vueConfig = {
     // If you want to turn on the proxy, please remosve the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.117:80/ocs-admin',
+        // target: 'http://192.168.2.117:80/ocs-admin',
         // target: 'https://t.ocs.360arrow.com/ocs-admin', //  练习
-        // target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
+        target: 'https://p.ocs.360arrow.com/ocs-admin', //  预发布
         ws: false,
         changeOrigin: true,
         pathRewrite: {