Merge remote-tracking branch 'origin/dev' into dev

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

@@ -68,6 +68,12 @@
       "index": 7
     },
     {
+      "label": "币别",
+      "prop": "currency",
+      "index": 7,
+      "width": 120
+    },
+    {
       "label": "备注",
       "prop": "remark",
       "overHidden": true,

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -84,6 +84,12 @@
             >删除
             </el-button>
           </template>
+          <template slot-scope="{ row }" slot="currency">
+            <el-select  v-if="row.$cellEdit" v-model="row.currency" 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>
+            <span v-else>{{ row.currency }}</span>
+          </template>
           <template slot="thisAmount" slot-scope="{ row }">
             <el-input
               v-if="row.$cellEdit"

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

@@ -68,6 +68,12 @@
       "index": 7
     },
     {
+      "label": "币别",
+      "prop": "currency",
+      "index": 7,
+      "width": 120
+    },
+    {
       "label": "备注",
       "prop": "remark",
       "overHidden": true,

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -71,6 +71,12 @@
             >选择销售合同
             </el-button>
           </template>
+          <template slot-scope="{ row }" slot="currency">
+            <el-select  v-if="row.$cellEdit" v-model="row.currency" 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>
+            <span v-else>{{ row.currency }}</span>
+          </template>
           <template slot="thisAmount" slot-scope="{ row }">
             <el-input
               v-if="row.$cellEdit"

src/views/purchase/contract/detailsPage.vue

@@ -861,12 +861,14 @@ export default {
           }
 
 
-          let invoiceList =  this.contactsData.map(item => {
-            if(item.amount){
-              return parseFloat(item.amount);
-            }else return 0
-          });
-          this.form.invoiceAmount = invoiceList.reduce((n,m) => n + m)
+          if(this.contactsData.length !==0){
+            let invoiceList =  this.contactsData.map(item => {
+              if(item.amount){
+                return parseFloat(item.amount);
+              }else return 0
+            });
+            this.form.invoiceAmount = invoiceList.reduce((n,m) => n + m)
+          }
 
           this.form.billNo = this.contactsData.map(item =>{return item.billNo}).join(",")
           let submitDto = {

src/views/purchase/contract/index.vue

@@ -34,11 +34,11 @@
             <el-table-column  label="提单号" prop="billNo" align="center" show-overflow-tooltip width="200"></el-table-column>
             <el-table-column  label="货物品种" prop="priceCategoryNames" align="center" show-overflow-tooltip width="180"></el-table-column>
             <el-table-column  label="件数" prop="purchaseQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
-            <el-table-column  label="发票重量" prop="grossWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
-            <el-table-column  label="码单重量" prop="netWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+            <el-table-column  label="发票重量" prop="invoiceWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+            <el-table-column  label="码单重量" prop="billWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
             <el-table-column  label="单价" prop="price" align="center" show-overflow-tooltip width="120"></el-table-column>
             <el-table-column  label="发票金额" prop="amount" align="center" show-overflow-tooltip width="180"></el-table-column>
-            <el-table-column  label="已发件数" prop="isArrival" align="center" show-overflow-tooltip width="200"></el-table-column>
+            <el-table-column  label="已收件数" prop="actualQuantity" align="center" show-overflow-tooltip width="200"></el-table-column>
           </el-table>
         </template>
         <template slot="menuLeft">
@@ -287,8 +287,9 @@ export default {
     },
     //表格展开触发
     expandChange(row, expendList) {
-      if(row.hasItem){
+      if(row){
         getItemByPid(row.id).then(res =>{
+          console.log(res.data.data)
           this.$set(this.dataList[row.$index],"insideList", res.data.data)
           row.loading = false
         })

src/views/salesManagement/salesContract/detailsPage.vue

@@ -841,6 +841,7 @@ export default {
             }
           }
           let orderUpLoadList = this.$refs.uploadFile.submitData();
+
           for (let j = 0; j < this.importInventoryData.length; j++) {
             if (this.importInventoryData[j].billNo === (null || "")) {
               return this.$message.error(`请输入销售明细第${j + 1}行的提单号`);
@@ -868,15 +869,20 @@ export default {
             }
           }
           this.buttonLoading = true;
-          this.form.billNo = this.importInventoryData.map(item =>{return item.billNo}).join(",")
 
-          //发票金额合计  存入主表
-          let invoiceList =  this.importInventoryData.map(item => {
-            if(item.amount){
-              return parseFloat(item.amount);
-            }else return 0
-          });
-          this.form.invoiceAmount = invoiceList.reduce((n,m) => n + m)
+          if(this.importInventoryData.length !== 0){
+            //提单号
+            this.form.billNo = this.importInventoryData.map(item =>{return item.billNo}).join(",")
+
+            //发票金额合计  存入主表
+            let invoiceList =  this.importInventoryData.map(item => {
+              if(item.amount){
+                return parseFloat(item.amount);
+              }else return 0
+            });
+            this.form.invoiceAmount = invoiceList.reduce((n,m) => n + m)
+          }
+
 
           let submitDto = {
             ...this.form,

src/views/salesManagement/salesContract/index.vue

@@ -30,16 +30,15 @@
       </template>
       <template slot-scope="scope" slot="expand" width="48px">
         <el-table :data="scope.row.insideList" v-loading="scope.row.loading">
-          <el-table-column   align="center"  width="60"></el-table-column>
-          <el-table-column  label="#" type="index" align="center"  width="50"></el-table-column>
-          <el-table-column  label="提单号" prop="billNO" align="center" show-overflow-tooltip width="150"></el-table-column>
-          <el-table-column  label="货物名称" prop="cname" align="center" show-overflow-tooltip width="150"></el-table-column>
-          <el-table-column  label="件数" prop="actualQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
-          <el-table-column  label="销售价格" prop="price" align="center" show-overflow-tooltip width="150"></el-table-column>
-          <el-table-column  label="销售数量" prop="actualQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
-          <el-table-column  label="码单数量" prop="billWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
-          <el-table-column  label="是否发货" prop="isSend" align="center" show-overflow-tooltip width="120"></el-table-column>
-          <el-table-column  label="付款金额" prop="amount" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column   align="center"  width="40"></el-table-column>
+          <el-table-column  label="提单号" prop="billNo" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column  label="合同号" prop="orgOrderNo" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column  label="货物名称" prop="priceCategory" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column  label="件数" prop="orderQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="发票重量" prop="invoiceWeight" align="center" show-overflow-tooltip width="150"></el-table-column>
+          <el-table-column  label="码单重量" prop="billWeight" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="发票金额" prop="amount" align="center" show-overflow-tooltip width="120"></el-table-column>
+          <el-table-column  label="已发件数" prop="actualQuantity" align="center" show-overflow-tooltip width="120"></el-table-column>
         </el-table>
       </template>
       <template slot="menuLeft">