瀏覽代碼

Merge branch 'develop_yh19' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh19

chenrui 2 年之前
父節點
當前提交
9fad7229e9

文件差異過大導致無法顯示
+ 1 - 0
public/js/axios.min.js


文件差異過大導致無法顯示
+ 0 - 0
public/js/echarts.min.js


文件差異過大導致無法顯示
+ 5 - 0
public/js/vue-router.min.js


文件差異過大導致無法顯示
+ 5 - 0
public/js/vue.min.js


文件差異過大導致無法顯示
+ 5 - 0
public/js/vuex.min.js


+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1683169531657
+  "version": 1684285408708
 }

+ 9 - 0
src/api/receiving.js

@@ -96,3 +96,12 @@ export const receivingAuditList = (params) => {
     method: 'post'
   })
 }
+// 修改入库数量
+export const updateRealPutQty = (params) => {
+  const url = `/receivingDetail/updateRealPutQty`
+  return axios({
+    url: url,
+    data: params,
+    method: 'post'
+  })
+}

+ 5 - 5
src/views/financialManagement/companyCollectionPayment/detail.vue

@@ -68,11 +68,11 @@ export default {
       spinning: false,
       // 表头
       columns: [
-        { title: '序号', dataIndex: 'no', align: 'center', width: '10%' },
-        { title: '单据号', dataIndex: 'bizNo', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'bizTypeDictValue', align: 'center', width: '15%', customRender: function (text) { return text || '--' } },
-        { title: '总款数', dataIndex: 'totalTypeNum', align: 'center', width: '10%', customRender: function (text) { return (text || text == 0)?text: '--' } },
-        { title: '总数量', dataIndex: 'totalNum', align: 'center', width: '10%', customRender: function (text) { return (text || text == 0)?text: '--'  } },
+        { title: '序号', dataIndex: 'no', align: 'center', width: '5%' },
+        { title: '单据号', dataIndex: 'bizNo', align: 'center', width: '30%', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'bizTypeDictValue', align: 'center', width: '25%', customRender: function (text) { return text || '--' } },
+        // { title: '总款数', dataIndex: 'totalTypeNum', align: 'center', width: '10%', customRender: function (text) { return (text || text == 0)?text: '--' } },
+        // { title: '总数量', dataIndex: 'totalNum', align: 'center', width: '10%', customRender: function (text) { return (text || text == 0)?text: '--'  } },
         { title: '金额', dataIndex: 'totalAmount', align: 'right', width: '20%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
         { title: '结算金额', dataIndex: 'settleAmount', align: 'right', width: '20%', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],

+ 1 - 1
src/views/financialManagement/companyReceivablePayable/detail.vue

@@ -100,7 +100,7 @@ export default {
         { title: '类型', dataIndex: 'bizTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '审核时间', dataIndex: 'auditTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '金额', dataIndex: 'totalAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '结算余额', dataIndex: 'unsettleAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 4 - 3
src/views/financialManagement/companyReceivablePayableNew/chooseBillModal.vue

@@ -2,7 +2,7 @@
   <a-drawer
     title="全部单据"
     placement="right"
-    class="chooseBillModal-modal jg-page-wrap"
+    class="chooseBillModal-new-modal jg-page-wrap"
     :visible="isShow"
     @close="isShow=false"
     width="70%"
@@ -208,9 +208,10 @@ export default {
 </script>
 
 <style lang="less">
-  .chooseBillModal-modal{
+  .chooseBillModal-new-modal{
     .btn-cont {
-      margin-bottom: 10px;
+      margin: 0 0 10px 0;
+      text-align: left;
     }
   }
 </style>

+ 12 - 23
src/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue

@@ -4,16 +4,15 @@
       <a-page-header :ghost="false" :backIcon="false" class="collectionPayment-back" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
-          <p style=" display: inline-block;margin-right:30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
+          <span style="margin-right:30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
           <a-button id="purchaseNewOrderEdit-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
         <template slot="extra" v-if="$hasPermissions('B_cPayment_printAndExport')">
           <div style="margin-top: 5px;">
             <PrintPanel ref="printBox" @handlePrint="handlePrint">
               <div style="padding:10px;" slot="extendCons">
-                <a-checkbox v-model="printAllName" :checked="printAllName" id="salesQuery-printAllName">打印完整产品名称</a-checkbox>
-                <a-checkbox v-model="printOrgCode" :checked="printOrgCode" id="salesQuery-printOrgCode">打印原厂编码</a-checkbox>
-                <a-checkbox v-model="printRemarks" :checked="printRemarks" id="salesQuery-printRemarks">打印备注</a-checkbox>
+                <a-checkbox v-model="printTotalKs" :checked="printTotalKs" id="salesQuery-printTotalKs">打印总款数</a-checkbox>
+                <a-checkbox v-model="printTotalNums" :checked="printTotalNums" id="salesQuery-printTotalNums">打印总数量</a-checkbox>
               </div>
             </PrintPanel>
             <a-divider type="vertical" />
@@ -240,9 +239,8 @@ export default {
       isChangeAs: false,
       maxAmountSettled: 0,
       enableFundAccount: false,
-      printOrgCode: false, // 打印原创编码
-      printAllName: false, // 打印全部名称
-      printRemarks: false // 打印备注
+      printTotalKs: false, // 打印原创编码
+      printTotalNums: false, // 打印全部名称
     }
   },
   computed: {
@@ -276,27 +274,22 @@ export default {
       return val
     }
   },
-  watch: {
-    printOrgCode (newValue, oldValue) {
-      localStorage.setItem('printOrgCode-' + this.$store.state.user.info.orgId, newValue)
-    },
-    printRemarks (newValue, oldValue) {
-      localStorage.setItem('printRemarks-' + this.$store.state.user.info.orgId, newValue)
-    },
-    printAllName (newValue, oldValue) {
-      localStorage.setItem('printAllName-' + this.$store.state.user.info.orgId, newValue)
-    }
-  },
   methods: {
     ...mapActions(['GetSettleAccountState']),
     // 打印预览/快捷打印
     handlePrint (type, printerType) {
       const _this = this
       const params = _this.getParams()
+      
       _this.spinning = true
-      let url = settleUnitPrint
+      let url = ''
       if (type == 'export') { //  导出
         url = settleUnitExport
+      }else{
+        url = settleUnitPrint
+        // 打印
+        params.printTotalKs = params.printTotalKs ? 1 : 0
+        params.printTotalNums = params.printTotalNums ? 1 : 0
       }
       // 打印或导出
       hdPrint(printerType, type, url, params, '单位应收应付', function () {
@@ -448,10 +441,6 @@ export default {
     pageInit () {
       const vm = this
       vm.$nextTick(() => {
-      // 是否默认打印原厂编码
-        vm.printOrgCode = localStorage.getItem('printOrgCode-' + this.$store.state.user.info.orgId) == 'true'
-        vm.printAllName = localStorage.getItem('printAllName-' + this.$store.state.user.info.orgId) == 'true'
-        vm.printRemarks = localStorage.getItem('printRemarks-' + this.$store.state.user.info.orgId) == 'true'
         vm.chooseLoadData = []
         vm.getsettleInfoAllList()
       })

+ 8 - 6
src/views/financialManagement/companyReceivablePayableNew/detail.vue

@@ -4,7 +4,7 @@
       <a-page-header :ghost="false" :backIcon="false" class="companyCollectionPaymentDetail-cont" >
         <!-- 自定义的二级文字标题 -->
         <template slot="subTitle">
-          <p style=" display: inline-block;margin-right: 30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</p>
+          <span style="margin-right: 30px;color: #000;font-size: 16px;font-weight: 600;">客户:{{ $route.params.name!='undefined'?$route.params.name: '--' }}</span>
           <a-button id="companyCollectionPaymentDetail-back-btn" type="link" @click="handleBack" class="button-default"> <a-icon type="rollback" /> 返回列表</a-button>
         </template>
       </a-page-header>
@@ -96,11 +96,13 @@ export default {
       // 表头
       columns: [
         { title: '序号', dataIndex: 'no', width: '6%', align: 'center' },
-        { title: '单据号', dataIndex: 'bizNo', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '类型', dataIndex: 'bizTypeDictValue', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '审核时间', dataIndex: 'auditTime', width: '20%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '金额', dataIndex: 'totalAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
-        { title: '余额', dataIndex: 'unsettleAmount', width: '17%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
+        { title: '单据号', dataIndex: 'bizNo', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '类型', dataIndex: 'bizTypeDictValue', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '审核时间', dataIndex: 'auditTime', width: '14%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '总款数', dataIndex: 'totalTypeNum', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '总数量', dataIndex: 'totalNum', width: '12%', align: 'right', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '金额', dataIndex: 'totalAmount', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } },
+        { title: '结算余额', dataIndex: 'unsettleAmount', width: '14%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text) : '--') } }
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {

+ 30 - 15
src/views/purchasingManagement/signWarehousing/edit.vue

@@ -18,9 +18,9 @@
           <div slot="message" >
             <div>
               产品款数 <strong>{{ item.totalPutCategory }}</strong> ,
-              本次发货数量合计 <strong>{{ item.totalPutQty }}</strong> ,
+              本次发货数量合计 <strong>{{ item.totalRealPutQty }}</strong> ,
               <div style="display: inline-block;" v-if="$hasPermissions('M_ShowAllCost')">
-                本次发货金额合计¥<strong>{{ item.totalPutAmount?toThousands(item.totalPutAmount,2):'0.00' }}</strong>
+                本次发货金额合计¥<strong>{{ item.totalRealPutAmount?toThousands(item.totalRealPutAmount,2):'0.00' }}</strong>
               </div>
             </div>
           </div>
@@ -45,11 +45,12 @@
           <template slot="warehouseNum" slot-scope="text, record">
             <a-input-number
               size="small"
-              v-model="record.putQty"
+              v-model="record.realPutQty"
               :precision="0"
               :min="0"
               :max="999999"
               style="width: 100%;"
+              @blur="changePutQty(record, bindex)"
               placeholder="请输入入库数量" />
           </template>
           <!-- 仓库仓位 -->
@@ -87,6 +88,7 @@
 import { commonMixin } from '@/utils/mixin'
 import { STable, VSelect } from '@/components'
 import { purchaseWriteStockIn, receivingQuery, receivingDetail } from '@/api/purchase'
+import { updateRealPutQty } from '@/api/receiving'
 import { purchaseUpdateWarehouse } from '@/api/purchaseDetail'
 import ProductType from '../../common/productType.js'
 import ProductBrand from '../../common/productBrand.js'
@@ -121,7 +123,7 @@ export default {
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
-            data.list[i].shippedQty = data.list[i].putQty
+            data.list[i].shippedQty = data.list[i].realPutQty
             const warehouseSn = data.list[i].warehouseSn || undefined
             const warehouseLocationSn = data.list[i].warehouseLocationSn || undefined
             if (warehouseSn || warehouseLocationSn) {
@@ -151,22 +153,19 @@ export default {
       const _this = this
       const arr = [
         { title: '序号', dataIndex: 'no', width: '4%', align: 'center' },
-        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '12%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
-        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '13%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '采购单价', dataIndex: 'discountedPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
+        { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
+        { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '12%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '采购数量', dataIndex: 'qty', width: '6%', align: 'center', scopedSlots: { customRender: 'origqty' } },
-        { title: '本次发货数量', dataIndex: 'shippedQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '本次发货金额', dataIndex: 'discountedAmount', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        // { title: '本次入库数量', dataIndex: 'putQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } },
-        { title: '本次入库数量', scopedSlots: { customRender: 'warehouseNum' }, width: '9%', align: 'center' },
-        { title: '本次入库金额', dataIndex: 'warehouseMoney', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
-        { title: '仓库仓位', scopedSlots: { customRender: 'warehousePosition' }, width: '13%', align: 'center' }
+        { title: '本次发货数量', dataIndex: 'putQty', width: '8%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次入库数量', scopedSlots: { customRender: 'warehouseNum' }, width: '8%', align: 'center' },
+        { title: '本次入库金额', dataIndex: 'realPutAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } },
+        { title: '仓库仓位', scopedSlots: { customRender: 'warehousePosition' }, width: '14%', align: 'center' }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
         arr.splice(4, 0, { title: '采购单价', dataIndex: 'discountedPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
-        arr.splice(8, 0, { title: '本次发货金额', dataIndex: 'discountedAmount', width: '9%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
+        arr.splice(8, 0, { title: '本次发货金额', dataIndex: 'discountedAmount', width: '8%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })
       }
       return arr
     }
@@ -269,6 +268,22 @@ export default {
         }
       })
     },
+    // 修改入库数量
+    changePutQty(record, bindex){
+      if(record.realPutQty == record.shippedQty){
+        return
+      }
+      this.spinning = true
+      updateRealPutQty({id:record.id,realPutQty:record.realPutQty}).then(res => {
+        if(res.status == 200){
+          this.$message.success(res.message)
+          this.$refs['table-' + bindex][0].refresh()
+        }else{
+          record.realPutQty = record.shippedQty
+        }
+        this.spinning = false
+      })
+    },
     // 修改仓库仓位
     changeWarehouseCascade (val, opt, ind, bindex) {
       let loadData = this.chooseLoadData[bindex][ind]

+ 2 - 5
src/views/purchasingManagement/signWarehousing/stockOrderDetail.vue

@@ -106,7 +106,6 @@ export default {
           const no = (data.pageNo - 1) * data.pageSize
           for (var i = 0; i < data.list.length; i++) {
             data.list[i].no = no + i + 1
-            data.list[i].receivingQty = data.list[i].putQty
           }
           this.localDataSource = data.list
           this.disabled = false
@@ -126,12 +125,10 @@ export default {
         { title: '产品编码', dataIndex: 'dealerProductEntity.code', width: '18%', align: 'center', customRender: function (text) { return text || '--' } },
         { title: '产品名称', dataIndex: 'dealerProductEntity.name', width: '17%', align: 'center', customRender: function (text) { return text || '--' }, ellipsis: true },
         { title: '原厂编码', dataIndex: 'dealerProductEntity.origCode', width: '16%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '采购单价', dataIndex: 'discountedPrice', width: '6%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '采购数量', width: '6%', align: 'center', scopedSlots: { customRender: 'qty' } },
-        { title: '本次发货数量', dataIndex: 'receivingQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
+        { title: '本次发货数量', dataIndex: 'putQty', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
         { title: '单位', dataIndex: 'dealerProductEntity.unit', width: '6%', align: 'center', customRender: function (text) { return text || '--' } },
-        // { title: '本次发货金额', dataIndex: 'discountedAmount', width: '9%', align: 'center', customRender: function (text) { return ((text || text == 0) ? text : '--') } },
-        { title: '本次入库数量', dataIndex: 'putQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } }
+        { title: '本次入库数量', dataIndex: 'realPutQty', width: '9%', align: 'center', customRender: function (text) { return text || '--' } }
       ]
       if (this.$hasPermissions('M_ShowAllCost')) {
         arr.splice(4, 0, { title: '采购单价', dataIndex: 'discountedPrice', width: '6%', align: 'right', customRender: function (text) { return ((text || text == 0) ? _this.toThousands(text, 2) : '--') } })

+ 7 - 9
vue.config.js

@@ -30,17 +30,15 @@ function isProd () {
 // 例如:https://www.foobar.com/my-app/
 // 需要将它改为'/my-app/'
 const BASE_URL = isProd ? '/' : '/'
-
 const assetsCDN = {
   css: [],
   // https://unpkg.com/browse/vue@2.6.10/
   js: [
-    '//vuepkg.oss-cn-beijing.aliyuncs.com/vue.min.js',
-    '//vuepkg.oss-cn-beijing.aliyuncs.com/vue-router.min.js',
-    '//vuepkg.oss-cn-beijing.aliyuncs.com/vuex.min.js',
-    '//vuepkg.oss-cn-beijing.aliyuncs.com/axios.min.js',
-    // '//vuepkg.oss-cn-beijing.aliyuncs.com/lodash.min.js',
-    '//vuepkg.oss-cn-beijing.aliyuncs.com/echarts.min.js'
+    BASE_URL + 'js/vue.min.js',
+    BASE_URL + 'js/vue-router.min.js',
+    BASE_URL + 'js/vuex.min.js',
+    BASE_URL + 'js/axios.min.js',
+    BASE_URL + 'js/echarts.min.js'
   ]
 }
 
@@ -211,8 +209,8 @@ const vueConfig = {
     // If you want to turn on the proxy, please remove the mockjs /src/main.jsL11
     proxy: {
       '/api': {
-        target: 'http://192.168.2.111/qpls-md',
-        // target: 'http://p.iscm.360arrow.com/qpls-md',
+        // target: 'http://192.168.2.117/qpls-md',
+        target: 'http://p.iscm.360arrow.com/qpls-md',
         // ws: false,
         ws: true,
         changeOrigin: true,

部分文件因文件數量過多而無法顯示