进口修改

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -470,8 +470,6 @@
           }
         })
 
-        console.log(this.option.column)
-
         if(data.itemsList){
           this.dataList = data.itemsList
           this.oldDataList = this.deepClone(data.itemsList)

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -11,7 +11,7 @@
                      size="small"
                      :disabled="!form.id"
                      @click.stop="confirmSettlement"
-          >付费
+          >{{finishDisabled?"撤销付费":"付费"}}
           </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
@@ -143,6 +143,7 @@
         itemsOption: option,
         billDetailDialog:false,
         financeDisabled:false,
+        finishDisabled:false,
         billType:"申请",
         params:{},
         id:"",
@@ -169,7 +170,7 @@
               span: 8,
               rules: [
                 {
-                  required: true,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }
@@ -233,7 +234,7 @@
                   trigger: 'blur'
                 },
                 {
-                  required: true,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }
@@ -399,8 +400,8 @@
           this.$refs.crud.rowCellAdd(item);
         })
         //明细列表金额总和等于form总金额
-        this.form.amount =  _.sum(this.dataList.map(item =>{ return parseFloat(item.amount)}));
-        this.form.srcOrderno = this.dataList.map(item =>{return item.srcOrderno}).join(",")
+        // this.form.amount =  _.sum(this.dataList.map(item =>{ return parseFloat(item.amount)}));
+        // this.form.srcOrderno = this.dataList.map(item =>{return item.srcOrderno}).join(",")
 
 
         this.billDetailDialog = false;
@@ -487,7 +488,7 @@
       afterEcho(data){
         this.form = data;
         this.oldForm = Object.assign({},data);
-
+        this.finishDisabled = data.financeStatus ==="结算完成"?true:false;
         this.financeDisabled = data.financeStatus == ("待结算" || "结算完成")?true:false;
         //待结算  付款日期 备注  可编辑
         if(data.financeStatus == "待结算"){

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -11,7 +11,7 @@
                      class="el-button--small-yh"
                      :disabled="financeDisabled || form.id"
                      @click.stop="confirmSettlement"
-          >收费
+          >{{finishDisabled?"撤销收费":"收费"}}
           </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
@@ -162,7 +162,7 @@
               span: 8,
               rules: [
                 {
-                  required: true,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }
@@ -226,7 +226,7 @@
                   trigger: 'blur'
                 },
                 {
-                  required: true,
+                  required: false,
                   message: ' ',
                   trigger: 'blur'
                 }
@@ -296,7 +296,8 @@
         },
         billDetailDialog:false,
         financeDisabled:false,
-        billType:"销售",
+        finishDisabled:false,
+        billType:"收费",
         //新旧数据对比
         oldForm:{},
         oldDataList:[],
@@ -390,8 +391,8 @@
         })
 
         //明细列表金额总和等于form总金额
-        this.form.amount =  _.sum(this.dataList.map(item =>{ return parseFloat(item.amount)}));
-        this.form.srcOrderno = this.dataList.map(item =>{return item.srcOrderno}).join(",")
+        // this.form.amount =  _.sum(this.dataList.map(item =>{ return parseFloat(item.amount)}));
+        // this.form.srcOrderno = this.dataList.map(item =>{return item.srcOrderno}).join(",")
         this.billDetailDialog = false;
       },
       thisAmountChange(row){
@@ -402,10 +403,12 @@
           row.thisAmount = 0;
         }
       },
-      rowUpdate(row, index, done, loading) {
+      rowUpdate(row, index, done) {
         done(row);
       },
       rowCell(row,index){
+
+        console.log(row)
         this.$refs.crud.rowCell(row, index)
       },
       rowDel(row,index){
@@ -485,6 +488,7 @@
         this.form = data;
         this.oldForm = Object.assign({},data);
 
+        this.finishDisabled = data.financeStatus ==="结算完成"?true:false;
         this.financeDisabled = data.financeStatus === "待结算"?false:true;
         this.$set(this.option,"disabled",this.financeDisabled)
 

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

@@ -23,6 +23,10 @@
   "summaryText": "合计",
   "sumColumnList": [
     {
+      "name": "actualQuantity",
+      "type": "sum"
+    },
+    {
       "name": "contractAmount",
       "type": "sum"
     },

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -181,7 +181,6 @@
                 v-model="row.cntrNo"
                 placeholder="请输入"
                 size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
                 @change="selectInventory(row)"
               ></el-input>
               <span v-else>{{ row.cntrNo }}</span>

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

@@ -23,6 +23,10 @@
   "summaryText": "合计",
   "sumColumnList": [
     {
+      "name": "actualQuantity",
+      "type": "sum"
+    },
+    {
       "name": "contractAmount",
       "type": "sum"
     },

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -120,7 +120,6 @@
                 v-model="row.cntrNo"
                 placeholder="请输入"
                 size="small"
-                oninput='this.value=this.value.replace(/[^(\d.)]/g,"").replace(/^(\d+)\.(\d\d).*$/, "$1.$2")'
                 @change="selectInventory(row)"
               ></el-input>
               <span v-else>{{ row.cntrNo }}</span>
@@ -192,6 +191,7 @@
                          clearable filterable>
                 <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
               </el-select>
+              <span v-else>{{ row.currency }}</span>
             </template>
             <template slot-scope="{row,index}" slot="menu">
               <el-button

src/views/purchase/contract/config/customerContact.json

@@ -23,6 +23,10 @@
   "summaryText": "合计",
   "sumColumnList": [
     {
+      "name": "orderQuantity",
+      "type": "sum"
+    },
+    {
       "name": "amount",
       "type": "sum"
     },

src/views/salesManagement/salesContract/config/importInventory.json

@@ -23,6 +23,10 @@
   "summaryText": "合计",
   "sumColumnList": [
     {
+      "name": "orderQuantity",
+      "type": "sum"
+    },
+    {
       "name": "amount",
       "type": "sum"
     },

src/views/salesManagement/salesContract/detailsPage.vue

@@ -703,6 +703,10 @@ export default {
     }else{
       this.$set(this.form,"currency","USD")
       this.$set(this.form,"exchangeRate",6.3686)
+      //采购日期默认当天
+      let date = new Date();
+      let strDate = date.getFullYear() + "-" + (date.getMonth() + 1) + "-" + date.getDate() + " " + date.getHours() + ":" + date.getMinutes() + ":" + date.getSeconds();
+      this.$set(this.form,"businesDate",strDate)
     }
   },
   components: {