财务部分提交 主营项目bug 修改

src/api/financialManagement/paymentRequest.js

@@ -0,0 +1,76 @@
+import request from '@/router/axios';
+
+//申请货款
+export const applyLoan = (data) => {
+  return request({
+    url: '/api/trade-finance/settlement/apply',
+    method: 'post',
+    data: data
+  })
+}
+
+//付款申请列表
+export function getList(current,size,params) {
+  return request({
+    url: '/api/trade-finance/settlement/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+//删除
+export function remove(id) {
+  return request({
+    url: '/api/trade-finance/settlement/remove',
+    method: 'post',
+    params:{
+      ids:id
+    }
+  })
+}
+
+//明细
+export const getDetails = (id) => {
+  return request({
+    url: '/api/trade-finance/settlement/detail',
+    method: 'get',
+    params: {
+      id:id
+    }
+  })
+}
+
+//明细
+export const modify = (data) => {
+  return request({
+    url: '/api/trade-finance/settlement/modify',
+    method: 'post',
+    data: data
+  })
+}
+
+//付款申请 - 请核
+export const paymentCheck = (data) => {
+  return request({
+    url: '/api/trade-finance/settlement/check',
+    method: 'post',
+    data: data
+  })
+}
+
+//账单明细列表
+export function getBillList(current,size,params) {
+  return request({
+    url: '/api/trade-finance/acc/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}

src/api/importTrade/purchase.js

@@ -87,12 +87,3 @@ export function getMarketDetailsList(current,size,params) {
   })
 }
 
-//采购列表申请货款
-export function applyPayment(list) {
-  return request({
-    url: '/api/trade-finance/acc/createAcc',
-    method: 'post',
-    data: list
-  })
-}
-

src/components/finance/applyPayment.vue

@@ -22,14 +22,14 @@
        添加账单
     </el-button>
     <div style="float: right;margin-right: 8px">
-      <el-button type="primary" size="small" @click="submit()">请核</el-button>
+      <el-button type="primary" size="small" @click="submit()">确定</el-button>
       <el-button size="small" @click="choceFun">取消</el-button>
     </div>
   </div>
 </template>
 
 <script>
-  import {applyPayment} from "@/api/importTrade/purchase";
+  import { applyLoan } from "@/api/financialManagement/paymentRequest";
 
     export default {
       name: "applyPayment",
@@ -69,7 +69,7 @@
             column: [
               {
                 label: '合同号',
-                prop: 'accSysNo',
+                prop: 'srcOrderno',
                 span: 12,
                 disabled:true,
               },
@@ -164,13 +164,16 @@
           this.list.splice(index, 1);
         },
         submit(){
-          const listData = []
-          this.list.forEach(item =>{
-            item.form.corpId = this.corpId
-            listData.push(item.form)
-          })
-          applyPayment(listData).then(res =>{
-
+          const itemsList =  this.list.map(item =>{ item.form.corpId = this.corpId; return item.form})
+          const params = {
+            billType : this.billType,
+            itemsList: itemsList
+          }
+          applyLoan(params).then(res =>{
+             if(res.data.success){
+               this.$message.success("操作成功!")
+               this.$emit("choceFun");
+             }
           })
         }
       }

src/page/index/tags.vue

@@ -153,9 +153,12 @@ export default {
         if (tag.label == "收货单(I)") {
           this.$store.commit("TAKE_OUT_DETAIL");
         }
-        if (tag.label == "付款管理") {
+        if (tag.label == "付款结算") {
           this.$store.commit("PAY_OUT_DETAIL");
         }
+        if (tag.label == "收款结算") {
+          this.$store.commit("RECE_OUT_DETAIL");
+        }
         this.$store.commit("DEL_TAG", tag);
         if (tag.value === this.tag.value) {
           tag = this.tagList[key === 0 ? key : key - 1]; //如果关闭本标签让前推一个

src/store/getters.js

@@ -31,6 +31,8 @@ const getters = {
   takeStatus: state => state.ifdetail.takeStatus,
   outStatus: state => state.ifdetail.outStatus,
   payStatus: state => state.ifdetail.payStatus,
-  outtaskStatus: state => state.ifdetail.outtaskStatus
+  outtaskStatus: state => state.ifdetail.outtaskStatus,
+  paySettle: state => state.ifdetail.paySettle,
+  receiptSettle: state => state.ifdetail.receiptSettle
 }
 export default getters

src/store/modules/ifdetail.js

@@ -6,7 +6,9 @@ const ifdetail = {
     takeStatus: false, //进口发货单
     outStatus: false, //出口发货单
     outtaskStatus: false, //出口收货单
-    payStatus: false //付款
+    payStatus: false, //付款
+    paySettle:false, //付款结算
+    receiptSettle:false, //收款结算
   },
   actions: {},
   mutations: {
@@ -65,13 +67,21 @@ const ifdetail = {
       state.outtaskStatus = false;
     },
     //付款管理
-    // 进入详情
+    // 进入付款结算
     PAY_IN_DETAIL(state) {
-      state.payStatus = true;
+      state.paySettle = true;
     },
-    //退出详情页
+    // 退出付款结算
     PAY_OUT_DETAIL(state) {
-      state.payStatus = false;
+      state.paySettle = false;
+    },
+    //进入收款结算
+    RECE_IN_DETAIL(state) {
+      state.receiptSettle = true;
+    },
+    //退出收款结算
+    RECE_OUT_DETAIL(state) {
+      state.receiptSettle = false;
     },
     //关闭所有
     DEL_ALL_DETAIL(state) {
@@ -90,10 +100,10 @@ const ifdetail = {
       if (tag.label == '收货单(N)') {
         state.domTakeStatus = true;
       }
-      if (tag.label == '进口发货单') {
+      if (tag.label == '发货单(I)') {
         state.goStatus = true;
       }
-      if (tag.label == "进口收货单") {
+      if (tag.label == "收货单(I)") {
         state.goStatus = true;
       }
       if (tag.label == '发货单(E)') {
@@ -102,8 +112,11 @@ const ifdetail = {
       if (tag.label == '收货单(E)') {
         state.outtaskStatus = true;
       }
-      if (tag.label == '付款管理') {
-        state.payStatus = true;
+      if (tag.label == '付款结算') {
+        state.paySettle = true;
+      }
+      if (tag.label == '收款结算') {
+        state.receiptSettle = true;
       }
     }
   }

src/views/financialManagement/billDetails/billDetails.vue

@@ -20,28 +20,13 @@
                    @click="addReceipt">新 单
         </el-button>
       </template>
-      <template slot-scope="scope" slot="menu">
-        <el-button
-          type="text"
-          icon="el-icon-edit"
-          size="small"
-          @click.stop="editOpen(scope.row, 2)"
-        >编辑
-        </el-button>
-        <el-button
-          type="text"
-          icon="el-icon-delete"
-          size="small"
-          @click.stop="rowDel(scope.row, scope.index)"
-        >删除
-        </el-button>
-      </template>
     </avue-crud>
   </basic-container>
 </template>
 
 <script>
   import option from "./configuration/mainList.json";
+  import { getBillList } from "@/api/financialManagement/paymentRequest";
 
   export default {
     data() {
@@ -123,7 +108,12 @@
         console.log('1')
       },
       onLoad(page, params = {}) {
-        params.billType = "付费"
+        this.loading = true;
+        getBillList(page.currentPage, page.pageSize,params).then(res=>{
+          this.dataList = res.data.data.records
+          this.page.total = res.data.data.total
+          this.loading = false;
+        })
       },
       goBack() {
         this.detailData=this.$options.data().detailData

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

@@ -23,6 +23,18 @@
       "overHidden": true
     },
     {
+      "label": "提单号",
+      "prop": "billNo",
+      "index": 1,
+      "overHidden": true
+    },
+    {
+      "label": "费用名称",
+      "prop": "srcOrderno",
+      "index": 1,
+      "overHidden": true
+    },
+    {
       "label": "金额",
       "prop": "amount",
       "index": 2,

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

@@ -21,26 +21,18 @@
       "label": "合同号",
       "prop": "srcOrderno",
       "overHidden": true,
-      "width": 120,
+      "width": 150,
       "index": 1
     },
     {
       "label": "客户名称",
-      "prop": "corpId",
+      "prop": "corpName",
       "search": true,
       "overHidden": true,
-      "width": 120,
+      "width": 180,
       "index": 2
     },
     {
-      "label": "收款日期",
-      "prop": "settlementDate",
-      "overHidden": true,
-      "search": true,
-      "width": 120,
-      "index": 3
-    },
-    {
       "label": "金额",
       "prop": "amount",
       "search": true,
@@ -59,14 +51,14 @@
       "label": "银行名称",
       "prop": "accountBank",
       "overHidden": true,
-      "width": 120,
+      "width": 150,
       "index": 6
     },
     {
       "label": "银行户头",
       "prop": "accountName",
       "overHidden": true,
-      "width": 120,
+      "width": 150,
       "index": 7
     },
     {
@@ -76,7 +68,7 @@
       "overHidden": true,
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
-      "width": 120,
+      "width": 150,
       "index": 8
     },
     {
@@ -91,7 +83,7 @@
       "overHidden": true,
       "prop": "remark",
       "index": 10,
-      "width": 120
+      "width": 200
     }
   ]
 }

src/views/financialManagement/paymentRequest/paymentRequest.vue

@@ -48,7 +48,7 @@
 
 <script>
   import option from "./configuration/mainList.json";
-  import {getList ,remove} from "@/api/financialManagement/financialManagement"
+  import { getList,remove} from "@/api/financialManagement/paymentRequest";
   import detailPage from "./paymentRequestDetails";
 
   export default {
@@ -60,9 +60,7 @@
         detailData:{},
         option: option,
         parentId:0,
-        dataList: [{
-          canem:""
-        }],
+        dataList: [],
         page: {
           pageSize: 10,
           pagerCount: 5,
@@ -72,13 +70,7 @@
       }
     },
     created() {
-      if(this.$route.query.params){
-        this.detailData={
-          params:this.$route.query.params
-        }
-        this.show = false;
-        // this.$store.commit("PAY_IN_DETAIL");
-      }
+
     },
     components:{
       detailPage
@@ -96,7 +88,7 @@
         this.show = false;
       },
       //编辑打开
-      editOpen(row, status){
+      editOpen(row, status) {
         this.detailData = {
           id: row.id,
           status: status
@@ -142,7 +134,7 @@
         console.log('1')
       },
       onLoad(page, params = {}) {
-        params.billType = "付费"
+        params.billType = "申请"
         this.loading = true
         getList(page.currentPage, page.pageSize,params).then(res =>{
           this.dataList = res.data.data.records

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -5,53 +5,38 @@
         <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
                    @click="backToList">返回列表
         </el-button>
-        <el-button type="info"
-                   class="el-button--small-yh add-customer-btn-two"
-                   :disabled="true"
-                   @click.stop="">请核
-        </el-button>
-        <el-button class="el-button--small-yh add-customer-btn" type="primary"
-                   @click.stop="editFinance"
-        >{{this.id?"确认修改" :"确认新增"}}
-        </el-button>
+        <div class="upper_right_button">
+          <el-button type="info"
+                     :disabled="!checkDisabled"
+                     class="el-button--small-yh"
+                     @click.stop="paymentCheck">请核
+          </el-button>
+          <el-button type="warning"
+                     class="el-button--small-yh"
+                     :disabled="checkDisabled"
+                     @click.stop="settlement">结算
+          </el-button>
+        </div>
       </div>
     </div>
     <div style="margin-top: 60px">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <el-form :model="form" ref="form" label-width="130px">
-          <el-row>
-            <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:8" :key="index">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <el-date-picker v-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]" size="small" type="date" :disabled="item.disabled?true:false" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-                <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择"  clearable filterable></el-select>
-                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
-                <el-select v-else-if="item.prop === 'currency'" style="width: 100%"   v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
-                  <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
-                </el-select>
-                <el-select v-else-if="item.prop === 'financeStatus'" style="width: 100%"   v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
-                  <el-option
-                    v-for="item in financeStatusDic"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-                <el-input type="age" v-else-if="item.prop === 'exchangeRate'" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入">
-                  <template   slot="append">%</template>
-                </el-input>
-                <el-input type="textarea" v-else-if="(item.prop === 'remark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false" autocomplete="off" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <avue-form ref="form" v-model="form" :option="option">
+          <template slot="corpId">
+            <select-component
+              v-model="form.corpId"
+              :configuration="configuration"
+            ></select-component>
+          </template>
+        </avue-form>
       </basic-container>
+      <containerTitle title="明细列表"></containerTitle>
       <basic-container>
-        <avue-crud :option="option"
+        <avue-crud :option="itemOption"
                    :data="dataList"
                    ref="crud"
-                   v-model="form"
+                   v-model="itemForm"
                    :page.sync="page"
                    @search-reset="searchReset"
                    @selection-change="selectionChange"
@@ -63,15 +48,15 @@
               type="text"
               icon="el-icon-view"
               size="small"
-              @click.stop=""
-            >费用确认
+              @click.stop="rowCell(scope.row,scope.index)"
+            >修改
             </el-button>
             <el-button
               type="text"
               icon="el-icon-edit"
               size="small"
               @click.stop=""
-            >移除数据
+            >删除
             </el-button>
           </template>
         </avue-crud>
@@ -81,12 +66,10 @@
 </template>
 
 <script>
-  import option from "./configuration/detailsPage.json";
-  import { getDetail,editFinance } from "@/api/financialManagement/financialManagement"
-  import {detailListData } from "@/api/importTrade/purchase";
-  import {getSysNo} from "@/api/importTrade/purchase";
-  import { getUserInfo } from "@/api/system/user";
+  import itemOption from "./configuration/detailsPage.json";
   import { contrastObj,contrastList } from "@/util/contrastData";
+  import { getDetails,modify, paymentCheck } from "@/api/financialManagement/paymentRequest";
+
   export default {
     name: "paymentDetailsPage",
     props: {
@@ -96,8 +79,10 @@
     },
     data() {
       return {
-        form: {},
-        option: option,
+        form:{},
+        itemForm: {},
+        itemOption: itemOption,
+        checkDisabled:false,
         parentId:0,
         id:"",
         dataList: [],
@@ -108,40 +93,19 @@
           total: 0,
         },
         query:{},
-        //客户组件配置控制
-        configuration:{
-          multipleChoices:false,
-          multiple:false,
-          disabled:false,
-          searchShow:true,
-          collapseTags:false,
-          placeholder:'请点击右边按钮选择',
-          dicData:[]
-        },
-        financeStatusDic:[{
-          label:'正常',
-          value:0
-        },{
-          label:'停用',
-          value:1
-        }],
-        //顶部from数据
-        basicData: {
+        option: {
+          menuBtn: false,
+          labelWidth: 100,
           column: [
             {
               label: '系统号',
               prop: 'sysNo',
-              disabled:true,
-              rules: [
-                {
-                  required: true,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
+              span: 8,
+              disabled: true
             },{
               label: '合同号',
               prop: 'srcOrderno',
+              span: 8,
               rules: [
                 {
                   required: true,
@@ -150,8 +114,10 @@
                 }
               ]
             }, {
-              label: '供应商',
+              label: '客户名称',
               prop: 'corpId',
+              sort:true,
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -163,6 +129,7 @@
             {
               label: '金额',
               prop: 'amount',
+              span: 8,
               rules: [
                 {
                   pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -172,11 +139,13 @@
               ]
             }, {
               label: '币别',
-              prop: 'currency'
+              prop: 'currency',
+              span: 8,
             },
             {
               label: '汇率',
               prop: 'exchangeRate',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -185,8 +154,9 @@
                 }
               ]
             },{
-              label: '银行名称',
+              label: '开户银行',
               prop: 'accountBank',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -197,6 +167,7 @@
             }, {
               label: '银行户头',
               prop: 'accountName',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -207,6 +178,7 @@
             }, {
               label: '银行账号',
               prop: 'accountNo',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -216,45 +188,9 @@
               ]
             },
             {
-              label: '手续费',
-              prop: 'serviceCharge',
-              rules: [
-                {
-                  required: false,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            },
-            {
-              label: '要求付款日期',
-              prop: 'orderNo',
-              type:"date",
-              rules: [
-                {
-                  required: false,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            }, {
-              label: '实际付款日期',
-              prop: 'orderNo',
-              type:"date",
-              rules: [
-                {
-                  required: false,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            },
-            {
-              label: '单据状态',
-              prop: 'financeStatus',
-            }, {
               label: '制单人',
               prop: 'createUserName',
+              span: 8,
               disabled:true,
               rules: [
                 {
@@ -266,6 +202,7 @@
             }, {
               label: '制单日期',
               prop: 'createTime',
+              span: 8,
               type:"date",
               disabled:true,
               rules: [
@@ -280,6 +217,7 @@
               label: '备注',
               prop: 'remark',
               span:24,
+              row:2,
               rules: [
                 {
                   required: false,
@@ -290,6 +228,16 @@
             },
           ],
         },
+        //客户组件配置控制
+        configuration:{
+          multipleChoices:false,
+          multiple:false,
+          disabled:false,
+          searchShow:true,
+          collapseTags:false,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
         oldForm:{},
         oldDataList:[],
       }
@@ -300,57 +248,86 @@
         this.currencyDic = res.data.data
       })
       if (this.detailData.id) {
-        this.id = BigInt(this.detailData.id);//字符串转数字  超长用BigInt
-        getDetail(this.id).then(res => {
+        this.id = this.detailData.id;
+        getDetails(this.id).then(res => {
           this.form = res.data.data;
           this.oldForm = Object.assign({},res.data.data);
-          this.configuration.dicData = res.data.data.customerModel;
+          this.checkDisabled = res.data.data.checkStatus === "未请核"?true:false;
           if(res.data.data.itemsList){
             this.dataList = res.data.data.itemsList
             this.oldDataList = this.deepClone(res.data.data.itemsList)
           }
         })
-      }else{
-        this.assignment()
       }
-
-      if(this.detailData.params){
-        detailListData(this.detailData.params.id).then(res =>{
-          this.form.corpId =  res.data.data.corpId;
-          this.form.srcOrderno =  res.data.data.orderNo;
-          this.configuration.dicData = res.data.data.corpsName;
-          res.data.data.itemsVOList.forEach((item,index) =>{
-            this.detailData.params.orderItemIds.forEach((e,i) =>{
-              if(e ==  index){
-                const params ={
-                  srcOrderno:res.data.data.orderNo,
-                  amount:item.amount,
-                  createUserName:item.createUserName,
-                  createTime:item.createTime,
-                }
-                this.$refs.crud.rowCellAdd(params);
-                this.$refs.crud.rowCell(params,this.dataList.length - 1)
+    },
+    methods: {
+      rowCell(row, index) {
+        this.$refs.crud.rowCell(row, index)
+      },
+      //验证新旧数据
+      verification(){
+        let verification;
+        if(contrastObj(this.form,this.oldForm) || contrastList(this.dataList,this.oldDataList)){
+          this.$confirm("您已改动数据,是否先保存在进行操作!", {
+            confirmButtonText: "保存",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(() => {
+            this.editPayment()
+          }).catch(()=>{
+            verification = false;  //取消改动数据
+          })
+        }else{
+          verification = true;   //没有动过数据
+        }
+        return verification
+      },
+      //请核
+      paymentCheck(){
+        if(this.verification()){
+          this.$confirm("您确定请核此次申请吗？", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(()=>{
+            const params ={
+              id : this.form.id,
+              billType: this.form.billType
+            }
+            paymentCheck(params).then(res =>{
+              if(res.data.success){
+                this.$message.success("请核成功!");
+                this.checkDisabled = res.data.data.checkStatus === "未请核"?true:false;
               }
             })
           })
-        })
-        this.assignment()
-      }
-    },
-    mounted() {
-      option.height = window.innerHeight - 640 ;
-    },
-    methods: {
-      assignment(){
-        getSysNo("CW-FK").then(res =>{
-          this.$set(this.form,"sysNo", res.data.data)
-          let date = new Date();
-          let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
-          this.$set(this.form,"createTime",strDate)
-        })
-        getUserInfo().then(res =>{
-          this.$set(this.form,"createUserName", res.data.data.name)
-        })
+        }
+      },
+      //结算
+      settlement(){
+        if(this.verification()){
+          this.$confirm("您确定结算此次申请吗？", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          }).then(()=>{
+            if(this.$store.getters.takeStatus){
+              this.$alert("结算页面已存在,请关闭收货单再进行操作", "温馨提示", {
+                confirmButtonText: "确定",
+                type: 'warning',
+                callback: action => {
+                }
+              });
+            }else{
+              //关闭一下存在的列表页  跳转
+              this.$router.$avueRouter.closeTag('/payment_settle');
+              this.$router.push({
+                path: "/payment_settle",
+                query: {params: this.form.id},
+              });
+            }
+          })
+        }
       },
       searchReset() {
         console.log('1')
@@ -367,24 +344,21 @@
       refreshChange() {
         console.log('1')
       },
-      editFinance(status){
+      editPayment(status){
         this.$refs["form"].validate((valid) => {
           if(valid){
             const params = {
               ...this.form,
-              billType:"付费",
+              billType:"申请",
               itemsList:this.dataList
             }
-            editFinance(params).then(res =>{
-              if(res.data.success){
-                this.form = res.data.data;
-                this.oldForm = Object.assign({},res.data.data);
-                this.configuration.dicData = res.data.data.customerModel;
-                if(res.data.data.itemsList){
-                  this.dataList = res.data.data.itemsList
-                  this.oldDataList = this.deepClone(res.data.data.itemsList)
-                }
-                this.$message.success("操作成功!")
+            modify(params).then(res =>{
+              this.$message.success("操作成功!")
+              this.form = res.data.data;
+              this.oldForm = Object.assign({},res.data.data);
+              if(res.data.data.itemsList){
+                this.dataList = res.data.data.itemsList
+                this.oldDataList = this.deepClone(res.data.data.itemsList)
               }
             })
             if(status === true){
@@ -434,14 +408,10 @@
     color: #323233;
     font-weight: 400;
   }
-  .add-customer-btn-two {
-    position: fixed;
-    right: 150px;
-    top: 115px;
-  }
-  .add-customer-btn {
+  .upper_right_button{
+    display: flex;
     position: fixed;
-    right: 36px;
+    right: 20px;
     top: 115px;
   }
 </style>

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

@@ -23,6 +23,18 @@
       "overHidden": true
     },
     {
+      "label": "提单号",
+      "prop": "billNo",
+      "index": 1,
+      "overHidden": true
+    },
+    {
+      "label": "费用名称",
+      "prop": "srcOrderno",
+      "index": 1,
+      "overHidden": true
+    },
+    {
       "label": "金额",
       "prop": "amount",
       "index": 2,

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -6,7 +6,7 @@
                    @click="backToList">返回列表
         </el-button>
         <el-button class="el-button--small-yh add-customer-btn" type="primary"
-                   @click.stop="editFinance"
+                   @click.stop="confirmSettlement"confirmSettlement
         >{{this.id?"确认修改" :"确认结算"}}
         </el-button>
       </div>
@@ -14,39 +14,20 @@
     <div style="margin-top: 60px">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <el-form :model="form" ref="form" label-width="130px">
-          <el-row>
-            <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:8" :key="index">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <el-date-picker v-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]" size="small" type="date" :disabled="item.disabled?true:false" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-                <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择"  clearable filterable></el-select>
-                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
-                <el-select v-else-if="item.prop === 'currency'" style="width: 100%"   v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
-                  <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
-                </el-select>
-                <el-select v-else-if="item.prop === 'financeStatus'" style="width: 100%"   v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
-                  <el-option
-                    v-for="item in financeStatusDic"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-                <el-input type="age" v-else-if="item.prop === 'exchangeRate'" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入">
-                  <template   slot="append">%</template>
-                </el-input>
-                <el-input type="textarea" v-else-if="(item.prop === 'remark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false" autocomplete="off" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <avue-form ref="form" v-model="form" :option="option">
+          <template slot="corpId">
+            <select-component
+              v-model="form.corpId"
+              :configuration="configuration"
+            ></select-component>
+          </template>
+        </avue-form>
       </basic-container>
       <basic-container>
-        <avue-crud :option="option"
+        <avue-crud :option="itemsOption"
                    :data="dataList"
                    ref="crud"
-                   v-model="form"
+                   v-model="itemsForm"
                    :page.sync="page"
                    @search-reset="searchReset"
                    @selection-change="selectionChange"
@@ -66,14 +47,14 @@
               icon="el-icon-view"
               size="small"
               @click.stop=""
-            >费用确认
+            >修改
             </el-button>
             <el-button
               type="text"
               icon="el-icon-edit"
               size="small"
               @click.stop=""
-            >移除数据
+            >删除
             </el-button>
           </template>
         </avue-crud>
@@ -102,9 +83,7 @@
 <script>
   import option from "./configuration/detailsPage.json";
   import { getDetail,editFinance } from "@/api/financialManagement/financialManagement"
-  import {detailListData } from "@/api/importTrade/purchase";
-  import {getSysNo} from "@/api/importTrade/purchase";
-  import { getUserInfo } from "@/api/system/user";
+  import { getDetails,modify } from "@/api/financialManagement/paymentRequest";
   import { contrastObj,contrastList } from "@/util/contrastData";
   import  billDetail from "@/components/bill/billDetail";
 
@@ -118,8 +97,8 @@
     data() {
       return {
         form: {},
-        option: option,
-        parentId:0,
+        itemsForm:{},
+        itemsOption: option,
         procurementDialog:false,
         id:"",
         dataList: [],
@@ -130,40 +109,19 @@
           total: 0,
         },
         query:{},
-        //客户组件配置控制
-        configuration:{
-          multipleChoices:false,
-          multiple:false,
-          disabled:false,
-          searchShow:true,
-          collapseTags:false,
-          placeholder:'请点击右边按钮选择',
-          dicData:[]
-        },
-        financeStatusDic:[{
-          label:'正常',
-          value:0
-        },{
-          label:'停用',
-          value:1
-        }],
-        //顶部from数据
-        basicData: {
+        option: {
+          menuBtn: false,
+          labelWidth: 100,
           column: [
             {
               label: '系统号',
               prop: 'sysNo',
-              disabled:true,
-              rules: [
-                {
-                  required: true,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
+              span: 8,
+              disabled: true
             },{
               label: '合同号',
               prop: 'srcOrderno',
+              span: 8,
               rules: [
                 {
                   required: true,
@@ -172,8 +130,10 @@
                 }
               ]
             }, {
-              label: '供应商',
+              label: '客户名称',
               prop: 'corpId',
+              sort:true,
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -185,6 +145,7 @@
             {
               label: '金额',
               prop: 'amount',
+              span: 8,
               rules: [
                 {
                   pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
@@ -194,11 +155,13 @@
               ]
             }, {
               label: '币别',
-              prop: 'currency'
+              prop: 'currency',
+              span: 8,
             },
             {
               label: '汇率',
               prop: 'exchangeRate',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -207,8 +170,9 @@
                 }
               ]
             },{
-              label: '银行名称',
+              label: '开户银行',
               prop: 'accountBank',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -219,6 +183,7 @@
             }, {
               label: '银行户头',
               prop: 'accountName',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -229,6 +194,7 @@
             }, {
               label: '银行账号',
               prop: 'accountNo',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -238,45 +204,9 @@
               ]
             },
             {
-              label: '手续费',
-              prop: 'serviceCharge',
-              rules: [
-                {
-                  required: false,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            },
-            {
-              label: '要求付款日期',
-              prop: 'orderNo',
-              type:"date",
-              rules: [
-                {
-                  required: false,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            }, {
-              label: '实际付款日期',
-              prop: 'orderNo',
-              type:"date",
-              rules: [
-                {
-                  required: false,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            },
-            {
-              label: '单据状态',
-              prop: 'financeStatus',
-            }, {
               label: '制单人',
               prop: 'createUserName',
+              span: 8,
               disabled:true,
               rules: [
                 {
@@ -288,6 +218,7 @@
             }, {
               label: '制单日期',
               prop: 'createTime',
+              span: 8,
               type:"date",
               disabled:true,
               rules: [
@@ -302,6 +233,7 @@
               label: '备注',
               prop: 'remark',
               span:24,
+              row:2,
               rules: [
                 {
                   required: false,
@@ -312,6 +244,24 @@
             },
           ],
         },
+        //客户组件配置控制
+        configuration:{
+          multipleChoices:false,
+          multiple:false,
+          disabled:false,
+          searchShow:true,
+          collapseTags:false,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
+        financeStatusDic:[{
+          label:'正常',
+          value:0
+        },{
+          label:'停用',
+          value:1
+        }],
+        //顶部from数据
         oldForm:{},
         oldDataList:[],
       }
@@ -329,37 +279,26 @@
         getDetail(this.id).then(res => {
           this.form = res.data.data;
           this.oldForm = Object.assign({},res.data.data);
-          this.configuration.dicData = res.data.data.customerModel;
           if(res.data.data.itemsList){
             this.dataList = res.data.data.itemsList
             this.oldDataList = this.deepClone(res.data.data.itemsList)
           }
         })
-      }else{
-        this.assignment()
       }
 
       if(this.detailData.params){
-        detailListData(this.detailData.params.id).then(res =>{
-          this.form.corpId =  res.data.data.corpId;
-          this.form.srcOrderno =  res.data.data.orderNo;
-          this.configuration.dicData = res.data.data.corpsName;
-          res.data.data.itemsVOList.forEach((item,index) =>{
-            this.detailData.params.orderItemIds.forEach((e,i) =>{
-              if(e ==  index){
-                const params ={
-                  srcOrderno:res.data.data.orderNo,
-                  amount:item.amount,
-                  createUserName:item.createUserName,
-                  createTime:item.createTime,
-                }
-                this.$refs.crud.rowCellAdd(params);
-                this.$refs.crud.rowCell(params,this.dataList.length - 1)
-              }
-            })
-          })
+        getDetails(this.detailData.params).then(res =>{
+          delete res.data.data.id;
+          delete res.data.data.sysNo;
+          delete res.data.data.billType;
+          res.data.data.itemsList.map((items)=>{ delete items.id })
+          this.form = res.data.data;
+          this.oldForm = Object.assign({},res.data.data);
+          if(res.data.data.itemsList){
+            this.dataList = res.data.data.itemsList
+            this.oldDataList = this.deepClone(res.data.data.itemsList)
+          }
         })
-        this.assignment()
       }
     },
     mounted() {
@@ -372,17 +311,6 @@
       importProMent(){
 
       },
-      assignment(){
-        getSysNo("CW-FK").then(res =>{
-          this.$set(this.form,"sysNo", res.data.data)
-          let date = new Date();
-          let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
-          this.$set(this.form,"createTime",strDate)
-        })
-        getUserInfo().then(res =>{
-          this.$set(this.form,"createUserName", res.data.data.name)
-        })
-      },
       searchReset() {
         console.log('1')
       },
@@ -398,25 +326,28 @@
       refreshChange() {
         console.log('1')
       },
-      editFinance(status){
+      confirmSettlement(status){
         this.$refs["form"].validate((valid) => {
           if(valid){
-            const params = {
-              ...this.form,
-              billType:"付费",
-              itemsList:this.dataList
-            }
-            editFinance(params).then(res =>{
-              if(res.data.success){
+            this.$confirm("是否确认结算？", "提示", {
+              confirmButtonText: "保存",
+              cancelButtonText: "取消",
+              type: "warning",
+            }).then(()=>{
+              const params = {
+                ...this.form,
+                billType:"付款",
+                itemsList:this.dataList
+              }
+              modify(params).then(res =>{
+                this.$message.success("操作成功!")
                 this.form = res.data.data;
                 this.oldForm = Object.assign({},res.data.data);
-                this.configuration.dicData = res.data.data.customerModel;
                 if(res.data.data.itemsList){
                   this.dataList = res.data.data.itemsList
                   this.oldDataList = this.deepClone(res.data.data.itemsList)
                 }
-                this.$message.success("操作成功!")
-              }
+              })
             })
             if(status === true){
               this.$emit("goBack");

src/views/financialManagement/receiptSettle/receiptSettle.vue

@@ -80,7 +80,13 @@
       detailPage
     },
     created() {
-
+      if(this.$route.query.params){
+        this.detailData={
+          params:this.$route.query.params
+        }
+        this.show = false;
+        this.$store.commit("RECE_IN_DETAIL");
+      }
     },
     mounted() {
       option.height = window.innerHeight - 350 ;

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -11,7 +11,7 @@
                    @click.stop="">请核
         </el-button>
         <el-button class="el-button--small-yh add-customer-btn" type="primary"
-                   @click.stop="editFinance "
+                   @click.stop="editReceipt "
         >{{this.id?"确认修改" :"确认结算"}}
         </el-button>
       </div>
@@ -19,39 +19,20 @@
     <div style="margin-top: 60px">
       <containerTitle title="基础信息"></containerTitle>
       <basic-container>
-        <el-form :model="form" ref="form" label-width="130px">
-          <el-row>
-            <el-col v-for="(item, index) in basicData.column" :span="item.span?item.span:8" :key="index">
-              <el-form-item :label="item.label" :prop="item.prop" :rules="item.rules">
-                <el-date-picker v-if="item.type === 'date'" style="width: 100%;" v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false" type="date" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss"/>
-                <el-select v-else-if="item.type === 'select'" style="width: 100%" size="small" placeholder="请选择" clearable filterable></el-select>
-                <selectComponent v-else-if="item.prop === 'corpId'" v-model="form[item.prop]" :configuration="configuration"/>
-                <el-select v-else-if="item.prop === 'currency'" style="width: 100%"   v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
-                  <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
-                </el-select>
-                <el-select v-else-if="item.prop === 'financeStatus'" style="width: 100%"   v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
-                  <el-option
-                    v-for="item in financeStatusDic"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value">
-                  </el-option>
-                </el-select>
-                <el-input type="age" v-else-if="item.prop === 'exchangeRate'" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入">
-                  <template   slot="append">%</template>
-                </el-input>
-                <el-input type="textarea" v-else-if="(item.prop === 'remark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
-                <el-input type="age" v-else v-model="form[item.prop]" size="small" :disabled="item.disabled?true:false" autocomplete="off" placeholder="请输入"></el-input>
-              </el-form-item>
-            </el-col>
-          </el-row>
-        </el-form>
+        <avue-form ref="form" v-model="form" :option="option">
+          <template slot="corpId">
+            <select-component
+              v-model="form.corpId"
+              :configuration="configuration"
+            ></select-component>
+          </template>
+        </avue-form>
       </basic-container>
       <basic-container>
-        <avue-crud :option="option"
+        <avue-crud :option="itemsOption"
                    :data="dataList"
                    ref="crud"
-                   v-model="form"
+                   v-model="itemsForm"
                    :page.sync="page"
                    @search-reset="searchReset"
                    @selection-change="selectionChange"
@@ -97,9 +78,7 @@
 <script>
   import option from "./configuration/detailsPage.json";
   import { getDetail,editFinance } from "@/api/financialManagement/financialManagement"
-  import {getSysNo} from "@/api/importTrade/purchase";
-  import { getUserInfo } from "@/api/system/user";
-  import { contrastObj,contrastList } from "@/util/contrastData";
+  import { detailSaleList } from "@/api/importTrade/salesContract"
 
   export default {
     name: "receiptDetailsPage",
@@ -111,53 +90,21 @@
     data() {
       return {
         form: {},
-        option: option,
-        id:'',
-        dataList: [],
-        currencyDic:[],
-        page: {
-          pageSize: 10,
-          pagerCount: 5,
-          total: 0,
-        },
-        query:{},
-        //新旧数据对比
-        oldForm:{},
-        oldItemList:[],
-        //客户组件配置控制
-        configuration:{
-          multipleChoices:false,
-          multiple:false,
-          disabled:false,
-          searchShow:true,
-          collapseTags:false,
-          placeholder:'请点击右边按钮选择',
-          dicData:[]
-        },
-        financeStatusDic:[{
-          value: '正常',
-          label: '正常'
-        },
-          {
-            value: '停用',
-            label: '停用'
-          }],
-        basicData: {
+        itemsForm:{},
+        itemsOption: option,
+        option: {
+          menuBtn: false,
+          labelWidth: 100,
           column: [
             {
               label: '系统号',
               prop: 'sysNo',
-              disabled:true,
-              rules: [
-                {
-                  required: true,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            },  {
+              span: 8,
+              disabled: true
+            },{
               label: '合同号',
               prop: 'srcOrderno',
+              span: 8,
               rules: [
                 {
                   required: true,
@@ -165,9 +112,11 @@
                   trigger: 'blur'
                 }
               ]
-            },{
+            }, {
               label: '客户名称',
               prop: 'corpId',
+              sort:true,
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -175,31 +124,27 @@
                   trigger: 'blur'
                 }
               ]
-            }, {
+            },
+            {
               label: '金额',
               prop: 'amount',
+              span: 8,
               rules: [
                 {
-                  required: false,
+                  pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                   message: ' ',
                   trigger: 'blur'
                 }
               ]
-            },
-            {
+            }, {
               label: '币别',
               prop: 'currency',
-              rules: [
-                {
-                  required: false,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
+              span: 8,
             },
             {
               label: '汇率',
               prop: 'exchangeRate',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -207,10 +152,10 @@
                   trigger: 'blur'
                 }
               ]
-            },
-            {
-              label: '银行名称',
+            },{
+              label: '开户银行',
               prop: 'accountBank',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -218,10 +163,10 @@
                   trigger: 'blur'
                 }
               ]
-            },
-            {
+            }, {
               label: '银行户头',
               prop: 'accountName',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -232,6 +177,7 @@
             }, {
               label: '银行账号',
               prop: 'accountNo',
+              span: 8,
               rules: [
                 {
                   required: false,
@@ -239,20 +185,11 @@
                   trigger: 'blur'
                 }
               ]
-            }, {
-              label: '收款日期',
-              prop: 'settlementDate',
-              type:'date',
-              rules: [
-                {
-                  required: false,
-                  message: ' ',
-                  trigger: 'blur'
-                }
-              ]
-            }, {
+            },
+            {
               label: '制单人',
               prop: 'createUserName',
+              span: 8,
               disabled:true,
               rules: [
                 {
@@ -261,11 +198,12 @@
                   trigger: 'blur'
                 }
               ]
-            },{
+            }, {
               label: '制单日期',
               prop: 'createTime',
+              span: 8,
+              type:"date",
               disabled:true,
-              type:'date',
               rules: [
                 {
                   required: false,
@@ -273,14 +211,12 @@
                   trigger: 'blur'
                 }
               ]
-            }, {
-              label: '单据状态',
-              prop: 'financeStatus',
             },
             {
               label: '备注',
               prop: 'remark',
               span:24,
+              row:2,
               rules: [
                 {
                   required: false,
@@ -291,6 +227,36 @@
             },
           ],
         },
+        id:'',
+        dataList: [],
+        currencyDic:[],
+        page: {
+          pageSize: 10,
+          pagerCount: 5,
+          total: 0,
+        },
+        query:{},
+        //新旧数据对比
+        oldForm:{},
+        oldItemList:[],
+        //客户组件配置控制
+        configuration:{
+          multipleChoices:false,
+          multiple:false,
+          disabled:false,
+          searchShow:true,
+          collapseTags:false,
+          placeholder:'请点击右边按钮选择',
+          dicData:[]
+        },
+        financeStatusDic:[{
+          value: '正常',
+          label: '正常'
+        },
+          {
+            value: '停用',
+            label: '停用'
+          }],
       }
     },
     created() {
@@ -309,15 +275,22 @@
             this.oldItemList = this.deepClone(res.data.data.itemsList)
           }
         })
-      }else{
-        getSysNo("CW-SK").then(res =>{
-          this.$set(this.form,"sysNo", res.data.data)
-          let date = new Date();
-          let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
-          this.$set(this.form,"createTime",strDate)
-        })
-        getUserInfo().then(res =>{
-          this.$set(this.form,"createUserName", res.data.data.name)
+      }
+
+      if(this.detailData.params){
+        detailSaleList(this.detailData.params).then(res =>{
+          delete res.data.data.id;
+          delete res.data.data.sysNo;
+          delete res.data.data.billType;
+
+          this.form = res.data.data;
+          this.oldForm = Object.assign({},res.data.data);
+          if(res.data.data.orderItemsList){
+            this.dataList = res.data.data.orderItemsList
+            this.oldDataList = this.deepClone(res.data.data.orderItemsList)
+          }
+          this.configuration.dicData = this.form.corpName
+
         })
       }
     },
@@ -340,7 +313,7 @@
       refreshChange() {
         console.log('1')
       },
-      editFinance(status){
+      editReceipt(status){
         this.$refs["form"].validate((valid) => {
           if(valid){
             const params = {

src/views/importTrade/invoice/config/mainList.json

@@ -54,7 +54,7 @@
       "width":150
     },
     {
-      "label": "发货日期",
+      "label": "收货日期",
       "prop": "businessDate",
       "overHidden": true,
       "search": true,
@@ -89,7 +89,7 @@
       "width":100
     },
     {
-      "label": "发货人",
+      "label": "收货人",
       "prop": "arrivalContact",
       "overHidden": true,
       "search": true,
@@ -98,7 +98,7 @@
       "width":120
     },
     {
-      "label": "发货电话",
+      "label": "收货电话",
       "prop": "arrivalTel",
       "overHidden": true,
       "search": true,
@@ -107,7 +107,7 @@
       "width":120
     },
     {
-      "label": "发货地址",
+      "label": "收货地址",
       "prop": "arrivalAddress",
       "overHidden": true,
       "search": true,

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -354,7 +354,7 @@ export default {
             ]
           },
           {
-            label: '发货日期',
+            label: '收货日期',
             prop: 'businessDate',
             type:'datetime',
             rules: [
@@ -366,7 +366,7 @@ export default {
             ]
           },
           {
-            label: '发货人',
+            label: '收货人',
             prop: 'arrivalContact',
             rules: [
               {
@@ -377,7 +377,7 @@ export default {
             ]
           },
           {
-            label: '发货电话',
+            label: '收货电话',
             prop: 'arrivalTel',
             rules: [
               {
@@ -388,7 +388,7 @@ export default {
             ]
           },
           {
-            label: '发货地址',
+            label: '收货地址',
             prop: 'arrivalAddress',
             rules: [
               {

src/views/importTrade/receipt/config/mainList.json

@@ -54,7 +54,7 @@
       "width":120
     },
     {
-      "label": "收货日期",
+      "label": "发货日期",
       "prop": "businessDate",
       "search": true,
       "overHidden": true,
@@ -89,7 +89,7 @@
       "width":100
     },
     {
-      "label": "收货人",
+      "label": "发货人",
       "prop": "arrivalContact",
       "search": true,
       "overHidden": true,
@@ -98,7 +98,7 @@
       "width":120
     },
     {
-      "label": "收货电话",
+      "label": "发货电话",
       "prop": "arrivalTel",
       "search": true,
       "overHidden": true,
@@ -107,7 +107,7 @@
       "width":120
     },
     {
-      "label": "收货地址",
+      "label": "发货地址",
       "prop": "arrivalAddress",
       "search": true,
       "overHidden": true,

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -356,7 +356,7 @@ export default {
               }
             ]
           },{
-            label: '收货日期',
+            label: '发货日期',
             prop: 'businessDate',
             type:'datetime',
             rules: [
@@ -368,7 +368,7 @@ export default {
             ]
           },
           {
-            label: '收货人',
+            label: '发货人',
             prop: 'arrivalContact',
             rules: [
               {
@@ -379,7 +379,7 @@ export default {
             ]
           },
           {
-            label: '收货电话',
+            label: '发货电话',
             prop: 'arrivalTel',
             rules: [
               {
@@ -390,7 +390,7 @@ export default {
             ]
           },
           {
-            label: '收货地址',
+            label: '发货地址',
             prop: 'arrivalAddress',
             rules: [
               {

src/views/purchase/contract/detailsPage.vue

@@ -294,7 +294,7 @@
       <apply-payment
         :billType="billType"
         :billData="billData"
-        :choceFun="choceApplyPaymentDialog"
+        :choceFun="choceFun"
       >
       </apply-payment>
     </el-dialog>
@@ -341,7 +341,7 @@ export default {
       optionTwo: commodity,
       loading: false,
       data: [],
-      billType:"CG",
+      billType:"申请",
       billData:{},
       page: {
         pageSize: 10,
@@ -948,11 +948,11 @@ export default {
     },
     beforeBillData(type){
       this.billData = {
-        accSysNo:this.form.orderNo,
+        srcOrderno:this.form.orderNo,
+        itemType:"采购",
         accDate:this.form.businesDate,
         currency:this.form.currency,
         exchangeRate:this.form.exchangeRate,
-        billType:"CG",
         srcParentId:this.form.id,
       }
       if(type){ //申请货款
@@ -1034,7 +1034,7 @@ export default {
       })
     },
     //关闭账单
-    choceApplyPaymentDialog(){
+    choceFun(){
       this.applyPaymentDialog  = false
     },
     //刷新

src/views/salesManagement/salesContract/detailsPage.vue

@@ -15,7 +15,7 @@
         <el-button type="warning"
                    class="el-button--small-yh"
                    :disabled="!form.id"
-                   @click.stop="generatePurchase">生成采购单
+                   @click.stop="applySettlement">申请结算
         </el-button>
         <el-button type="success"
                    class="el-button--small-yh"
@@ -738,8 +738,8 @@ export default {
         row.amount =_.multiply(row.invoiceWeight,row.price).toFixed(2);
       }
     },
-    //生成采购单
-    generatePurchase(){
+    //申请结算
+    applySettlement(){
       if(contrastObj(this.form,this.oldForm) || contrastList(this.importInventoryData,this.oldInventoryData)
         || contrastList(this.orderFeesList,this.oldFeesList) || contrastList(this.orderFilesList,this.oldFilesList)
       ){
@@ -751,15 +751,25 @@ export default {
           this.editCustomer();
         })
       }else{
-         const  params = {
-          ...this.form,
-           orderItemsList:this.importInventoryData,
-           orderFeesList:this.orderFeesList,
-           orderFilesList:this.orderFilesList
-        }
-        generatePurchase(params).then(res=>{
-          if(res.data.success){
-            this.$message.success("操作成功!")
+        this.$confirm("是否确认申请结算!", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          if(this.$store.getters.takeStatus){
+            this.$alert("结算页面已存在,请关闭收货单再进行操作", "温馨提示", {
+              confirmButtonText: "确定",
+              type: 'warning',
+              callback: action => {
+              }
+            });
+          }else{
+            //关闭一下存在的列表页  跳转
+            this.$router.$avueRouter.closeTag('/receipt_settle');
+            this.$router.push({
+              path: "/receipt_settle",
+              query: {params: this.form.id},
+            });
           }
         })
       }
@@ -794,9 +804,6 @@ export default {
             if (this.importInventoryData[j].orderQuantity === "") {
               return this.$message.error(`请输入销售明细第${j + 1}行的数量`);
             }
-            if (this.importInventoryData[j].orderQuantity == 0) {
-              return this.$message.error(`销售明细第${j + 1}行的数量不能为0`);
-            }
           }
 
           this.form.billNo = this.importInventoryData.map(item =>{return item.billNo}).join(",")

src/views/workManagement/main-items/detailsPage.vue

@@ -310,7 +310,7 @@
               disabled: true,
               rules: [
                 {
-                  required: true,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }

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': '/'