修改国内贸易

src/views/businessManagement/deliveryNotice/detailsPageEdit.vue

@@ -175,7 +175,7 @@
                          icon="el-icon-plus"
                          size="small"
                          @click="marketDialog = true"
-                         :disabled="detailData.seeDisabled || arrivalDisabled"
+                         :disabled="detailData.seeDisabled || arrivalDisabled || deliverDisabled"
                          v-if="goodsActives == 'goods'"
               >录入明细
               </el-button>
@@ -506,6 +506,7 @@ export default {
         collapseTags: false,
         placeholder: "请点击右边按钮选择",
         dicData: [],
+        clearable: true,
       },
       form: {},
       data: [],
@@ -1144,6 +1145,9 @@ export default {
       //   row.deliveryAmount = Number(row.actualQuantity) * Number(row.scale)
       // }
       if (this.goodsActives == 'goods') {
+        if (Number(row.actualQuantity) < Number(row.arrivalQuantity)) {
+          row.arrivalQuantity = row.actualQuantity
+        }
         row.deliveryAmount = Number(row.actualQuantity) * Number(row.price)
         this.form.deliveryAmount = 0
         this.form.totalQuantity = 0
@@ -1242,7 +1246,8 @@ export default {
         this.contactsData[this.choiceIndexT].priceCategory = this.tableData[0].goodsTypeName
         selectGoodsNum({
           goodsId: this.tableData[0].id,
-          itemType: this.tableData[0].typeno
+          itemType: this.tableData[0].typeno,
+          tradeType: 'GN'
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -1287,7 +1292,8 @@ export default {
           console.log(this.tableData[item])
           selectGoodsNum({
             goodsId: this.tableData[item].id,
-            itemType: this.tableData[item].typeno
+            itemType: this.tableData[item].typeno,
+            tradeType: 'GN'
           }).then(res =>{
             this.tableData[item].storageQuantity =  res.data.data
             this.$set(this.tableData[item], 'specificationAndModel', this.tableData[item].typeno)
@@ -1543,7 +1549,8 @@ export default {
             this.$set(item, 'contractAmount', item.deliveryAmount)
           })
           this.form.deliveryItemsList = this.contactsData.concat(this.giftData)
-          this.form.deliveryFeesList = this.advantageProjectData
+          // this.form.deliveryFeesList = this.advantageProjectData
+          this.form.deliveryFeesList = this.$refs.feeInfo.submitData()
           this.form.deliveryFilesList = this.bankOfDepositData
           if (typeof this.form.corpsTypeId == 'object') {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")
@@ -1722,6 +1729,7 @@ export default {
         this.$set(item, 'arrivalQuantity', 0)
         this.$set(item, 'orgOrderNo', this.form.orgOrderNo)
         this.$set(item, 'srcOrderNo', this.form.srcOrderNo)
+        this.$set(item, 'arrivalQuantity', item.actualQuantity)
         this.$set(item, "srcId", item.id)
         if (this.goodsActives == "goods") {
           this.$set(item, 'goodType', 0)
@@ -1781,7 +1789,9 @@ export default {
       this.contactsData.forEach(item => {
         selectGoodsNum({
           goodsId: item.itemId,
-          itemType: item.itemType
+          itemType: item.itemType? item.itemType: item.typeno,
+          tradeType: 'GN',
+          storageId: this.form.storageId
         }).then(res => {
           item.inventoryNumber = res.data.data
         }).finally(() => {

src/views/businessManagement/deliveryNotice/index.vue

@@ -129,7 +129,7 @@ export default {
       dataList: [],
       page: {
         pageSize: 10,
-        pagerCount: 5,
+        currentPage: 1,
         total: 0,
         pageSizes: [10,50,100,200,300]
       },
@@ -317,14 +317,15 @@ export default {
       this.selection = list;
       this.single = list.length !== 1;
     },
-    currentChange() {
-      console.log('1')
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
     },
-    sizeChange() {
-      console.log('1')
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
     },
     refreshChange() {
-      console.log('1')
+      this.page.currentPage = 1;
+      this.onLoad(this.page,this.search);
     },
     onLoad(page, params) {
       if (this.search.businessDate.length > 0) {

src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -164,24 +164,24 @@
               ></el-input>
               <span v-else>{{ row.price }}</span>
             </template>
-            <template slot="storageQuantity" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model.trim="row.storageQuantity"
-                size="small"
-                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-              ></el-input>
-              <span v-else>{{ row.storageQuantity }}</span>
-            </template>
-            <template slot="actualQuantity" slot-scope="{ row }">
-              <el-input
-                v-if="row.$cellEdit"
-                v-model.trim="row.actualQuantity"
-                size="small"
-                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'
-              ></el-input>
-              <span v-else>{{ row.actualQuantity }}</span>
-            </template>
+<!--            <template slot="storageQuantity" slot-scope="{ row }">-->
+<!--              <el-input-->
+<!--                v-if="row.$cellEdit"-->
+<!--                v-model.trim="row.storageQuantity"-->
+<!--                size="small"-->
+<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.storageQuantity }}</span>-->
+<!--            </template>-->
+<!--            <template slot="actualQuantity" slot-scope="{ row }">-->
+<!--              <el-input-->
+<!--                v-if="row.$cellEdit"-->
+<!--                v-model.trim="row.actualQuantity"-->
+<!--                size="small"-->
+<!--                oninput='this.value=this.value.replace(/[^\-?\d.]/g,"").replace(/^(\-)*(\d+)\.(\d\d).*$/, "$1$2.$3")'-->
+<!--              ></el-input>-->
+<!--              <span v-else>{{ row.actualQuantity }}</span>-->
+<!--            </template>-->
             <template slot="code" slot-scope="{row,index}">
               <el-button type="text" size="mini" style="padding:4px 10px;float:left" @click="commodityChoice(row)" :disabled="detailData.seeDisabled || !row.$cellEdit">选择</el-button>
               <span>{{ row.code }}</span>
@@ -227,6 +227,7 @@
           :disabled="detailData.seeDisabled"
           feeUrl="/trade-purchase/purchase-order/removeByFees"
           optionType="GN"
+          @beforeFinance="beforeFinance"
         />
 <!--        <containerTitle title="费用明细"></containerTitle>-->
 <!--        <basic-container style="margin-bottom: 10px">-->
@@ -735,6 +736,7 @@ export default {
             label: '已付金额',
             prop: 'settlmentAmount',
             type: 'number',
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -1102,7 +1104,7 @@ export default {
             this.$set(this.goodsListSave[item], 'storageQuantity', res.data.data)
             this.goodsListSave[item].itemId = this.goodsListSave[item].id
             this.goodsListSave[item].priceCategory = this.goodsListSave[item].goodsTypeName
-            delete this.tableData[item].id
+            delete this.goodsListSave[item].id
             this.$set(this.goodsListSave[item], 'itemType', this.goodsListSave[item].typeno)
             this.$set(this.goodsListSave[item], 'specificationAndModel', this.goodsListSave[item].typeno)
             this.$set(this.goodsListSave[item], 'priceType', '一般')
@@ -1373,7 +1375,8 @@ export default {
           }
           //商品信息
           this.form.itemsVOList = this.contactsData
-          this.form.orderFeesList = this.advantageProjectData
+          // this.form.orderFeesList = this.advantageProjectData
+          this.form.orderFeesList = this.$refs.feeInfo.submitData()
           this.form.orderFilesList = this.bankOfDepositData
           if (typeof this.form.corpsTypeId == 'object') {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")
@@ -1420,7 +1423,7 @@ export default {
       this.billType = type
       //采购明细提单号 list
       this.billData = {
-        srcOrderno:this.form.srcOrderNo,
+        srcOrderno:this.form.orderNo,
         itemType:"采购",
         corpsName:this.form.corpsName,
         corpId:this.form.corpId,
@@ -1430,6 +1433,7 @@ export default {
         taxRate: '0',
         accDate: this.form.businesDate,
         srcType: 1,
+        tradeType: 'GN'
       }
       if(bool){ //申请货款
         this.billData.srcId = -1
@@ -1562,6 +1566,14 @@ export default {
     importStagList(row, index) {
       this.goodsListSave.push(row);
     },
+    beforeFinance(feesData,callback) {
+      this.orderFeesList = feesData;
+      let params = {}
+      params.valid = true
+      params.parentId = this.form.id
+      params.srcOrderno = this.form.orderNo
+      callback(params)
+    },
   }
 }
 </script>

src/views/businessManagement/purchaseOrder/index.vue

@@ -132,7 +132,7 @@ export default {
       dataList: [],
       page: {
         pageSize: 10,
-        pagerCount: 5,
+        currentPage: 1,
         total: 0,
         pageSizes: [10,50,100,200,300]
       },
@@ -291,14 +291,15 @@ export default {
       this.single = list.length !== 1;
       this.multiple = list.length == 0
     },
-    currentChange() {
-      console.log('1')
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
     },
-    sizeChange() {
-      console.log('1')
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
     },
     refreshChange() {
-      console.log('1')
+      this.page.currentPage = 1;
+      this.onLoad(this.page,this.search);
     },
     onLoad(page, params) {
       if (this.search.requiredArrivalDate.length > 0) {
@@ -378,7 +379,6 @@ export default {
         }
       }
       let a = []
-      console.log(this.selection)
       this.selection.forEach(item => {
         let form = {
           form: {
@@ -392,6 +392,8 @@ export default {
             exchangeRate: '1',
             taxRate: '0',
             accDate: item.businesDate,
+            srcType: 1,
+            tradeType: 'GN'
           }
         }
         a.push(form)

src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -570,7 +570,7 @@ export default {
             prop: 'srcOrderNo',
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -774,6 +774,7 @@ export default {
         this.$set(item, "inventoryNumber", item.storageQuantity)
         this.$set(item, "srcId", item.id)
         this.$set(item, "deliveryAmount", item.amount)
+        this.$set(item, "purchaseAmount", item.price)
         this.$set(item, "purchaseQuantity", Number(item.orderQuantity))
         this.$set(item, "actualQuantity", (Number(item.orderQuantity) - Number(item.actualQuantity)))
         // 入库数量和入库金额的比例
@@ -1304,7 +1305,8 @@ export default {
           })
           //商品信息
           this.form.deliveryItemsList = this.contactsData
-          this.form.deliveryFeesList = this.advantageProjectData
+          // this.form.deliveryFeesList = this.advantageProjectData
+          this.form.deliveryFeesList = this.$refs.feeInfo.submitData()
           this.form.deliveryFilesList = this.bankOfDepositData
           if (typeof this.form.corpsTypeId == 'object') {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")

src/views/businessManagement/receipt/index.vue

@@ -131,7 +131,7 @@ export default {
       dataList: [],
       page: {
         pageSize: 10,
-        pagerCount: 5,
+        currentPage: 1,
         total: 0,
         pageSizes: [10,50,100,200,300]
       },
@@ -320,14 +320,15 @@ export default {
       this.selection = list;
       this.single = list.length !== 1;
     },
-    currentChange() {
-      console.log('1')
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
     },
-    sizeChange() {
-      console.log('1')
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
     },
     refreshChange() {
-      console.log('1')
+      this.page.currentPage = 1;
+      this.onLoad(this.page,this.search);
     },
     onLoad(page, params) {
       if (this.search.businessDate.length > 0) {
@@ -382,7 +383,7 @@ export default {
         this.$delete(data,'createTime')
       }
       this.page.currentPage = 1;
-      // this.onLoad(this.page, data);
+      this.onLoad(this.page, data);
     },
     //列保存触发
     async saveColumn() {

src/views/businessManagement/salesOrder/detailsPageEdit.vue

@@ -183,7 +183,7 @@
                   v-else-if="(item.prop === 'advancePayment') || (item.prop === 'orderAmount') || (item.prop === 'settlmentAmount')"
                   v-model.trim="form[item.prop]" size="small" autocomplete="off"
                   @change="computedCost"
-                  :disabled="detailData.seeDisabled"
+                  :disabled="detailData.seeDisabled || item.disabled"
                   v-input-limit="2"
                 ></el-input>
                 <span v-else-if="item.prop === 'caseOverPayment'">
@@ -204,7 +204,7 @@
                      placeholder="总溢付款"
                      style="width: 50%"></el-input>
                 </span>
-                <el-select v-else-if="item.prop === 'orderStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled">
+                <el-select v-else-if="item.prop === 'orderStatus'" v-model="form[item.prop]" placeholder="请选择" clearable filterable style="width: 100%" size="small" :disabled="detailData.seeDisabled || item.disabled">
                   <el-option v-for="(item,index) in statusOption" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
                 <el-input type="age" v-else-if="item.prop === 'grossProfitRate'" v-model.trim="form[item.prop]" size="small" autocomplete="off" placeholder="请输入" :disabled="detailData.seeDisabled" v-input-limit="2">
@@ -993,6 +993,7 @@ export default {
           }, {
             label: '已收款',
             prop: 'settlmentAmount',
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -1134,6 +1135,7 @@ export default {
           }, {
             label: '单据状态',
             prop: 'orderStatus',
+            disabled: true,
             rules: [
               {
                 required: false,
@@ -1851,6 +1853,7 @@ export default {
         taxRate: '0',
         accDate: this.form.businesDate,
         srcType: 1,
+        tradeType: 'GN'
       }
       if(bool){ //申请货款
         this.billData.srcId = -1
@@ -1966,7 +1969,8 @@ export default {
         this.contactsData[this.choiceIndexT].priceCategory = this.tableData[0].goodsTypeName
         selectGoodsNum({
           goodsId: this.tableData[0].id,
-          itemType: this.tableData[0].typeno
+          itemType: this.tableData[0].typeno,
+          tradeType: 'GN'
         }).then(res => {
           this.contactsData[this.choiceIndexT].storageQuantity =  res.data.data
         })
@@ -2032,7 +2036,8 @@ export default {
         })
         selectGoodsNum({
           goodsId: this.goodsListSave[item].id,
-          itemType: this.goodsListSave[item].typeno
+          itemType: this.goodsListSave[item].typeno,
+          tradeType: 'GN'
         }).then(res => {
           this.$set(this.goodsListSave[item], 'storageQuantity', res.data.data)
           // this.goodsListSave[item].storageQuantity =  res.data.data
@@ -2094,7 +2099,8 @@ export default {
         // debugger
         selectGoodsNum({
           goodsId: this.tableData[item].id,
-          itemType: this.tableData[item].typeno
+          itemType: this.tableData[item].typeno,
+          tradeType: 'GN'
         }).then(res => {
           this.tableData[item].priceCategory = this.tableData[item].goodsTypeName
           this.tableData[item].storageQuantity =  res.data.data
@@ -2253,7 +2259,8 @@ export default {
         }
         selectGoodsNum({
           goodsId: list[item].itemId,
-          itemType: list[item].typeno
+          itemType: list[item].typeno,
+          tradeType: 'GN'
         }).then(res => {
           this.$set(list[item], 'storageQuantity', res.data.data)
           if (listLength != 0) {
@@ -2520,7 +2527,8 @@ export default {
               return this.$message.error('订货数量不能小于等于0')
             }
           }
-          this.form.orderFeesList = this.advantageProjectData
+          // this.form.orderFeesList = this.advantageProjectData
+          this.form.orderFeesList = this.$refs.feeInfo.submitData()
           this.form.orderFilesList = this.bankOfDepositData
           if (typeof this.form.corpsTypeId == 'object') {
             this.form.corpsTypeId = this.form.corpsTypeId.join(",")

src/views/businessManagement/salesOrder/index.vue

@@ -127,7 +127,7 @@ export default {
       dataList: [],
       page: {
         pageSize: 10,
-        pagerCount: 5,
+        currentPage: 1,
         total: 0,
         pageSizes: [10,50,100,200,300]
       },
@@ -333,13 +333,14 @@ export default {
       this.selection = list;
       this.single = list.length !== 1;
     },
-    currentChange() {
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
     },
-    sizeChange() {
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
     },
     //列表刷新触发
     refreshChange() {
-      console.log(this.form)
       this.page.currentPage = 1;
       this.onLoad(this.page,this.search);
     },
@@ -349,7 +350,6 @@ export default {
         detail(row.id).then(res => {
           row.insideList = res.data.data.orderItemsList
           row.loading = false
-          console.log(row.insideList)
         })
       }
     },