bug

src/api/basicData/inventoryAccount.js

@@ -30,6 +30,15 @@ export function typeSave(data) {
 // 查询商品库存
 export function selectGoodsNum(data) {
   return request({
+    url: '/api/blade-stock/client/get_stock',
+    method: 'get',
+    params: data
+  })
+}
+
+// 查询进口库存
+export function selectJKGoodsNum(data) {
+  return request({
     url: '/api/blade-stock/client/getStockByCondition',
     method: 'get',
     params: data

src/api/importTrade/salesContract.js

@@ -83,6 +83,18 @@ export function getOrgOrderNo(billNo,billType) {
   })
 }
 
+//提单号带出合同号   发货单专属
+export function getListOrgOrderNo(billNo,storageId) {
+  return request({
+    url: '/api/blade-stock/client/listStockByCondition',
+    method: 'get',
+    params:{
+      billNo:billNo,
+      storageId:storageId
+    }
+  })
+}
+
 //生成采购单
 export function generatePurchase(data) {
   return request({

src/components/procurement/config/market.json

@@ -23,7 +23,7 @@
   "column":[
     {
       "label": "合同号",
-      "prop": "orderNo",
+      "prop": "orgOrderNo",
       "search": true,
       "index": 1,
       "width":180

src/components/procurement/market.vue

@@ -57,18 +57,27 @@
       this.option = await this.getColumnData(this.getColumnName(42), option);
       if (this.systemType == 'GN') {
         this.option.column.forEach(item => {
-          if (item.prop == 'billNo' || item.prop == 'invoiceWeight' || item.prop == 'billWeight' || item.prop == 'orderNo'
+          if (item.prop == 'billNo' || item.prop == 'invoiceWeight' || item.prop == 'billWeight' || item.prop == 'orgOrderNo'
             || item.prop == 'priceCategoryNames' || item.prop == 'itemType'
           ) {
             item.hide = true;
             item.showColumn = false;
           }
           // 隐藏查询
-          if (item.prop == 'orderNo') {
+          if (item.prop == 'orgOrderNo') {
             item.search = false
           }
         })
       }
+      if(this.systemType == 'JK'){
+        this.option.column.forEach(item => {
+          if ( item.prop == 'itemType' || item.prop == 'typeno' || item.prop == 'code'  || item.prop == 'corpName'
+          ) {
+            item.hide = true;
+            item.showColumn = false;
+          }
+        })
+      }
       // 搜索按钮位置自适应
       let i = 0;
       this.option.column.forEach(item => {

src/views/financialManagement/billDetails/billDetails.vue

@@ -77,7 +77,7 @@
 
     },
     mounted() {
-      option.height = window.innerHeight - 200 ;
+      // option.height = window.innerHeight - 200 ;
     },
     methods: {
       //新单打开

src/views/financialManagement/billDetails/configuration/mainList.json

@@ -21,6 +21,18 @@
   "searchIndex": 2,
   "addBtn":false,
   "headerAlign": "center",
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "amount",
+      "type": "sum"
+    },
+    {
+      "name": "settlementAmount",
+      "type": "sum"
+    }
+  ],
   "column": [
     {
       "label": "合同号",
@@ -66,8 +78,8 @@
           "value": "申请"
         },
         {
-          "label": "销售",
-          "value":"销售"
+          "label": "收款",
+          "value":"收款"
         }
       ]
     },

src/views/financialManagement/paymentRequest/configuration/mainList.json

@@ -23,6 +23,14 @@
   "expand": true,
   "expandWidth": 38,
   "selectionWidth": 40,
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "amount",
+      "type": "sum"
+    }
+  ],
   "column": [
     {
       "label": "合同号",

src/views/financialManagement/paymentRequest/paymentRequest.vue

@@ -98,7 +98,7 @@
       detailPage
     },
     mounted() {
-      this.option.height = window.innerHeight - 200;
+      // this.option.height = window.innerHeight - 200;
     },
     methods: {
       //新单打开

src/views/financialManagement/paymentSettle/configuration/mainList.json

@@ -21,6 +21,14 @@
   "searchIndex": 2,
   "addBtn":false,
   "headerAlign": "center",
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "amount",
+      "type": "sum"
+    }
+  ],
   "column": [
     {
       "label": "合同号",

src/views/financialManagement/paymentSettle/paymentSettle.vue

@@ -103,7 +103,7 @@
       detailPage
     },
     mounted() {
-      this.option.height = window.innerHeight - 200;
+      // this.option.height = window.innerHeight - 200;
     },
     methods: {
       //新单打开

src/views/financialManagement/receiptSettle/configuration/mainList.json

@@ -21,6 +21,14 @@
   "searchIndex": 2,
   "addBtn":false,
   "headerAlign": "center",
+  "showSummary": true,
+  "summaryText": "合计",
+  "sumColumnList": [
+    {
+      "name": "amount",
+      "type": "sum"
+    }
+  ],
   "column": [
     {
       "label": "合同号",

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -105,7 +105,7 @@
       }
     },
     mounted() {
-      this.option.height = window.innerHeight - 200;
+      // this.option.height = window.innerHeight - 200;
     },
     methods: {
       //新单打开

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -241,7 +241,7 @@
         @closeFun="!marketDialog"
         @importMarket="importMarket"
         @close="closeMarkeDialog"
-        systemType="CK"
+        systemType="JK"
       >
       </market-detail>
     </el-dialog>
@@ -262,9 +262,9 @@ import {corpsbank, getList} from "@/api/basicData/deliveryNotice"
 import upLoadOption from "../../exportTrade/purchaseContract/config/uploadList.json";
 import { contrastObj,contrastList } from "@/util/contrastData";
 import {getStorage} from "@/api/importTrade/receipt"
-import { getOrgOrderNo } from "@/api/importTrade/salesContract"
+import { getListOrgOrderNo } from "@/api/importTrade/salesContract"
 import  marketDetail from "@/components/procurement/market";
-import {selectGoodsNum} from "@/api/basicData/inventoryAccount"
+import {selectJKGoodsNum} from "@/api/basicData/inventoryAccount"
 import _ from "lodash";
 import  {generateShipment} from "@/api/importTrade/salesContract"
 
@@ -501,7 +501,6 @@ export default {
         //是否计算合同号
         this.form.id = null
         this.form.sysNo = null
-        console.log(this.form.orderItemsList)
         this.form.orderItemsList.forEach((item, index) => {
 
           item.srcId = item.id
@@ -516,11 +515,20 @@ export default {
             item.actualQuantity = item.orderQuantity;
           }
 
+          //查询库存
+          console.log(123)
+          getListOrgOrderNo(item.billNo).then(res => {
+            console.log(res)
+            // if (res.data) {
+            //   this.contractDic = res.data;
+            //   row.contractNumber = res.data[0].orderNo
+            // }
+          })
+
           delete item.orderQuantity
           delete item.id
         })
         this.contactsData = this.form.orderItemsList
-        console.log(this.contactsData)
         this.sumOrderNo();
         delete this.form.orderItemsList
       }).finally(()=>{
@@ -581,11 +589,11 @@ export default {
     },
     //提单号带出合同号
     bingOut(row) {
-      getOrgOrderNo(row.billNo).then(res => {
-        if (res.data) {
-          this.contractDic = res.data;
-          row.contractNumber = res.data[0].orderNo
-        }
+      getListOrgOrderNo(row.billNo,this.form.storageId).then(res => {
+        // if (res.data) {
+        //   this.contractDic = res.data;
+        //   row.contractNumber = res.data[0].orderNo
+        // }
       }).catch(() => {
         row.contractNumber = ''
       })
@@ -602,7 +610,7 @@ export default {
           storageId: this.form.storageId,
           cntrNo: row.cntrNo
         }
-        selectGoodsNum(params).then(res => {
+        selectJKGoodsNum(params).then(res => {
           if(res.data.data){
             this.$set(this.contactsData[row.$index],"inventoryNumber",res.data.data.inQuantity)
             this.$set(this.contactsData[row.$index],"inWeight",res.data.data.inWeight)

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -269,7 +269,7 @@ import {detailListData } from "@/api/importTrade/purchase";
 import { contrastObj,contrastList } from "@/util/contrastData";
 import { getOrgOrderNo } from "@/api/importTrade/salesContract"
 import  procurementDetail from "@/components/procurement/purchase";
-import {selectGoodsNum} from "@/api/basicData/inventoryAccount"
+import {selectJKGoodsNum} from "@/api/basicData/inventoryAccount"
 import _ from "lodash";
 
 export default {
@@ -572,7 +572,7 @@ export default {
           storageId:this.form.storageId,
           cntrNo:row.cntrNo
         }
-        selectGoodsNum(params).then(res =>{
+        selectJKGoodsNum(params).then(res =>{
           if(res.data.data){
             this.$set(this.contactsData[row.$index],"inventoryNumber",res.data.data.inQuantity)
             this.$set(this.contactsData[row.$index],"inWeight",res.data.data.inWeight)

vue.config.js

@@ -27,10 +27,10 @@ module.exports = {
       '/api': {
         //本地服务接口地址
         // target: 'http://192.168.1.177:1080',
-        target: 'http://192.168.1.151:1080',
+        // target: 'http://192.168.1.151:1080',
         // 打包地址.
         // target: 'http://121.37.83.47:10004',//服务器ip
-        // target: 'http://trade.tubaosoft.com:10004',//服务器域名
+        target: 'http://trade.tubaosoft.com:10004',//服务器域名
         ws: true,
         pathRewrite: {
           '^/api': '/'