进口修改

src/components/finance/applyPayment.vue

@@ -178,8 +178,8 @@ export default {
             ]
           },
           {
-            label: '单价',
-            prop: 'price',
+            label: '金额',
+            prop: 'amount',
             span: 8,
             rules: [
               {
@@ -195,8 +195,8 @@ export default {
             ]
           },
           {
-            label: '金额',
-            prop: 'amount',
+            label: '单价',
+            prop: 'price',
             span: 8,
             rules: [
               {
@@ -205,19 +205,6 @@ export default {
                 trigger: 'blur'
               },
               {
-                required: true,
-                message: ' ',
-                trigger: 'blur'
-              }
-            ]
-          },
-          {
-            label: this.billData.itemType === "采购" ? '付款日期' : "收款日期",
-            prop: 'date',
-            type: 'date',
-            span: 8,
-            rules: [
-              {
                 required: false,
                 message: ' ',
                 trigger: 'blur'
@@ -231,7 +218,7 @@ export default {
             span: 8,
             rules: [
               {
-                required: true,
+                required: false,
                 message: ' ',
                 trigger: 'blur'
               }
@@ -275,6 +262,7 @@ export default {
           {
             label: '税率',
             prop: 'taxRate',
+            value:0,
             span: 8,
             rules: [
               {
@@ -304,6 +292,9 @@ export default {
     })
     if (this.arrList.length == 0) {
       this.form.form = this.billData
+      if(this.billData.billNoList.length === 1){
+        this.form.form.billNo = this.billData.billNoList[0]
+      }
       this.corpId = this.billData.corpId
       this.configuration.dicData = this.billData.corpsName
       this.addForm();
@@ -337,10 +328,12 @@ export default {
     // },
     //币别选择
     currencyChange(valueForm) {
-      if (valueForm.currency === "USD") {
-        valueForm.exchangeRate = 6.3686;
-      } else {
+      if (valueForm.currency === "CNY") {
         valueForm.exchangeRate = 1;
+      } else  if (valueForm.currency === "USD"){
+        valueForm.exchangeRate = 6.3686;
+      }else{
+        valueForm.exchangeRate = 7.1749;
       }
     },
     async submit() {
@@ -383,7 +376,7 @@ export default {
               })
             }
             //采购退款结算 销售收款结算  不需申请请核 直接结算  => 结算
-            if(this.billType === "采购退款结算" || this.billType === "销售收款结算"){
+            if(this.billType === "采购退款" || this.billType === "销售收款"){
               paymentApply(params).then(res=>{
                 if(res.data.success){
                   this.$message.success("操作成功!")

src/views/financialManagement/paymentRequest/paymentRequestDetails.vue

@@ -275,7 +275,7 @@
               label: '备注',
               prop: 'remark',
               span:24,
-              row:2,
+              minRows: 2,
               rules: [
                 {
                   required: false,

src/views/financialManagement/paymentSettle/paymentSettleDetailsPage.vue

@@ -8,11 +8,14 @@
         <div class="upper_right_button">
           <el-button type="warning"
                      class="el-button--small-yh"
+                     size="small"
+                     :disabled="!form.id"
                      @click.stop="confirmSettlement"
           >付费
           </el-button>
           <el-button class="el-button--small-yh"
                      type="primary"
+                     size="small"
                      @click.stop="saveSettlement"
           >{{form.id?"确认修改" :"确认新增"}}
           </el-button>
@@ -248,7 +251,8 @@
                   trigger: 'blur'
                 }
               ]
-            }, {
+            },
+            {
               label: '制单日期',
               prop: 'createTime',
               span: 8,
@@ -263,10 +267,23 @@
               ]
             },
             {
+              label: '付款日期',
+              prop: 'time',
+              span: 8,
+              type:"date",
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
               label: '备注',
               prop: 'remark',
               span:24,
-              row:2,
+              minRows: 2,
               rules: [
                 {
                   required: false,
@@ -509,7 +526,7 @@
   .upper_right_button{
     display: flex;
     position: fixed;
-    right: 20px;
-    top: 43px;
+    right: 12px;
+    top: 47px;
   }
 </style>

src/views/financialManagement/receiptSettle/receiptSettleDetailsPage.vue

@@ -9,7 +9,7 @@
           <el-button type="warning"
                      size="small"
                      class="el-button--small-yh"
-                     :disabled="financeDisabled"
+                     :disabled="financeDisabled || form.id"
                      @click.stop="confirmSettlement"
           >收费
           </el-button>
@@ -259,6 +259,19 @@
               ]
             },
             {
+              label: '收款日期',
+              prop: 'time',
+              span: 8,
+              type:"date",
+              rules: [
+                {
+                  required: false,
+                  message: ' ',
+                  trigger: 'blur'
+                }
+              ]
+            },
+            {
               label: '备注',
               prop: 'remark',
               span:24,
@@ -333,7 +346,7 @@
       // }
     },
     mounted() {
-      option.height = window.innerHeight - 640 ;
+
     },
     methods: {
       //选择客户
@@ -507,7 +520,7 @@
 .upper_right_button{
   display: flex;
   position: fixed;
-  right: 20px;
-  top: 43px;
+  right: 12px;
+  top: 47px;
 }
 </style>

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

@@ -67,8 +67,14 @@
       "width":120
     },
     {
-      "label": "库存",
-      "prop": "inventoryNumber",
+      "label": "库存件数",
+      "prop": "inQuantity",
+      "index": 5,
+      "width":120
+    },
+    {
+      "label": "库存重量",
+      "prop": "inWeight",
       "index": 5,
       "width":120
     },

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -731,9 +731,9 @@ export default {
                 this.$message.success("发货成功!")
                 this.goodsDisable = res.data.data.deliveryStatus === "已发货" ? true : false
               }
-            }).finally(() => {
-              this.buttonLoading = false
             })
+          }).finally(() => {
+            this.buttonLoading = false
           })
         } else {
           this.$confirm("是否撤回发货?", {
@@ -748,9 +748,9 @@ export default {
                 this.$message.success("撤销成功!")
                 this.goodsDisable = res.data.data.deliveryStatus === "已发货" ? true : false
               }
-            }).finally(() => {
-              this.buttonLoading = false
             })
+          }).finally(() => {
+            this.buttonLoading = false
           })
         }
       }

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

@@ -80,8 +80,14 @@
       "width":120
     },
     {
-      "label": "库存",
-      "prop": "inventoryNumber",
+      "label": "库存件数",
+      "prop": "inQuantity",
+      "index": 5,
+      "width":120
+    },
+    {
+      "label": "库存重量",
+      "prop": "inWeight",
       "index": 5,
       "width":120
     },

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -532,10 +532,8 @@ export default {
         this.$set(this.form,'saleman',res.data.data.salesName)
         this.$set(this.form,'corpId',res.data.data.corpsName[0].id)
         this.$set(this.form,'orgOrderNo', res.data.data.orgOrderNo)
-        // this.$set(this.form,'billWeight', res.data.data.orgOrderNo)
-        // this.$set(this.form,'invoiceWeight', res.data.data.orgOrderNo)
         this.$set(this.configuration,'dicData', res.data.data.corpsName)
-
+        this.totalChange();  //调用合计 算出重量
       }).finally(()=>{
         this.buttonLoading = false;
       })
@@ -768,9 +766,9 @@ export default {
                 this.$message.success("收货成功!")
                 this.receiptDisable = res.data.data.deliveryStatus === "已收货" ?   true :false
               }
-            }).finally(()=>{
-              this.buttonLoading = false;
             })
+          }).finally(()=>{
+            this.buttonLoading = false;
           })
         }else{
           this.$confirm("是否撤销收货!", {
@@ -779,15 +777,14 @@ export default {
             type: "warning"
           }).then(()=>{
             this.form.deliveryItemsList = this.contactsData;
-
             repealReceipt(this.form).then(res =>{
               if(res.data.success){
                 this.$message.success("撤销成功!")
                 this.receiptDisable = res.data.data.deliveryStatus === "已收货" ?   true :false
               }
-            }).finally(()=>{
-              this.buttonLoading = false;
             })
+          }).finally(()=>{
+            this.buttonLoading = false;
           })
         }
       }

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

@@ -128,7 +128,7 @@
       "label": "税率",
       "prop": "taxRate",
       "index": 10,
-      "width":120,
+      "width":180,
       "rules": [
         {
           "required": false,

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

@@ -80,6 +80,13 @@
       "width":150
     },
     {
+      "label": "合同金额",
+      "prop": "amount",
+      "overHidden": true,
+      "index": 5,
+      "width":100
+    },
+    {
       "label": "件数",
       "prop": "orderQuantity",
       "overHidden": true,

src/views/purchase/contract/detailsPage.vue

@@ -79,21 +79,20 @@
                 <el-select v-else-if="item.prop === 'orderType'"  style="width: 100%"  v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in contractTypeDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
-                <el-select v-else-if="item.prop === 'currency'" style="width: 100%"  :disabled="item.disabled?true:false || takeDisabled"  v-model="form[item.prop]" size="small" placeholder="请选择" @change="currencyChange" clearable filterable>
+                <el-select v-else-if="item.prop === 'currency'" style="width: 100%"  :disabled="item.disabled?true:false || takeDisabled"  v-model="form[item.prop]" size="small" placeholder="请选择" @change="currencyChange('true')" clearable filterable>
                   <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
                 </el-select>
-                <el-input type="age" v-else-if="item.type === 'unit'" v-model="form[item.prop]"  :disabled="item.disabled?true:false || takeDisabled" size="small" autocomplete="off"  @change="currencyChange" placeholder="请输入">
-                  <template   slot="append">%</template>
-                </el-input>
                 <el-select v-else-if="item.prop === 'paymentType'"  style="width: 100%"  v-model="form[item.prop]" size="small" placeholder="请选择" clearable filterable>
                   <el-option v-for="(item,index) in paymentTypeDic" :key="index" :label="item.dictValue" :value="item.dictValue"></el-option>
                 </el-select>
                 <div v-else-if="item.prop === 'advancePayment'">
                   <el-input type="age" v-model="form[item.prop]" style="width: 70%" :disabled="item.disabled?true:false || takeDisabled"  size="small" autocomplete="off" placeholder="请输入"></el-input>
-                  <el-select v-model="form['prepayCurrency']" size="small" style="width: 30%"  :disabled="item.disabled?true:false || takeDisabled" value="USD"   placeholder="请选择" @change="advCurrencyChange" clearable filterable>
+                  <el-select v-model="form['prepayCurrency']" size="small" style="width: 30%"  :disabled="item.disabled?true:false || takeDisabled" value="USD"   placeholder="请选择" clearable filterable>
                     <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
                   </el-select>
                 </div>
+                <el-input type="age" v-else-if="item.prop === 'exchangeRate'" v-model="form[item.prop]"  :disabled="item.disabled?true:false || takeDisabled" size="small" autocomplete="off"  @change="currencyChange" placeholder="请输入">
+                </el-input>
                 <el-input type="textarea" v-else-if="(item.prop === 'orderRemark')" v-model="form[item.prop]"   size="small" autocomplete="off" placeholder="请输入"></el-input>
                 <el-input type="age" v-else v-model="form[item.prop]" :disabled="item.disabled?true:false || takeDisabled" size="small" autocomplete="off" placeholder="请输入"></el-input>
               </el-form-item>
@@ -219,8 +218,8 @@
                         size="small"
                         autocomplete="off"
                         placeholder="请输入">
-                <template slot="append"
-                >%</template>
+<!--                <template slot="append"
+                >%</template>-->
               </el-input>
               <span v-else>{{ row.taxRate }}</span>
             </template>
@@ -281,11 +280,11 @@
       :close-on-press-escape="false"
       v-dialog-drag
     >
-      <bill-application
+<!--      <bill-application
         :billType="billType"
         @choceApplication="choceApplication"
       >
-      </bill-application>
+      </bill-application>-->
     </el-dialog>
     <el-dialog
       append-to-body
@@ -318,7 +317,7 @@ import {detailListData, submitData} from "@/api/importTrade/purchase";
 import feeInfo from "@/components/fee-info/main";
 import uploadFile from "@/components/upload-file/main";
 import _ from "lodash";
-import  billApplication from "@/components/bill/billApplication";
+// import  billApplication from "@/components/bill/billApplication";
 //商品详情接口
 import { corpsattn } from "@/api/basicData/configuration"
 import { contrastObj,contrastList } from "@/util/contrastData";
@@ -333,8 +332,9 @@ export default {
   components: {
     ApplyPayment,
     feeInfo,
-    uploadFile,
-    billApplication
+    uploadFile
+/*    ,
+    billApplication*/
   },
   data() {
     return {
@@ -605,7 +605,6 @@ export default {
             prop: 'currency'
           }, {
             label: '汇率',
-            type:"unit",
             prop: 'exchangeRate',
           }, {
             label: '人民币金额',
@@ -780,23 +779,19 @@ export default {
       }
     },
     //带出人民币
-    currencyChange(){
-      if(this.form.exchangeRate == 1 || this.form.exchangeRate == 6.368600 || this.form.exchangeRate == 7.174900){
+    currencyChange(type){
+      if(type === "true"){
         if(this.form.currency === "CNY"){  //如果为人民币
           this.$set(this.form,"exchangeRate",1)
-          this.$set(this.form,"rmbAmount",this.form.orderAmount)
         }else if(this.form.currency === "USD"){
           this.$set(this.form,"exchangeRate",6.3686)
-          this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, 6.3686).toFixed(2))
         }else{
           this.$set(this.form,"exchangeRate",7.1749)
-          this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, 7.1749).toFixed(2))
-        }
-      }else{
-        if(this.form.orderAmount && this.form.exchangeRate){
-          this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, this.form.exchangeRate).toFixed(2))
         }
       }
+      if(this.form.orderAmount && this.form.orderAmount){
+        this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, this.form.exchangeRate).toFixed(2))
+      }
     },
     //合计
     totalChange(){
@@ -966,7 +961,7 @@ export default {
       }
     },
     beforeBillData(bool,type){
-      this.billType = type === "申请"?"采购申请货款":"采购退款结算"
+      this.billType = type === "申请"?"采购申请货款":"采购退款"
       //采购明细提单号 list
       this.billData = {
         srcOrderno:this.form.orderNo,

src/views/salesManagement/salesContract/detailsPage.vue

@@ -436,15 +436,11 @@ export default {
             ]
           },
           {
-            label: '已收金额',
-            prop: 'settlmentAmount',
+            label: '业务员',
+            prop: 'salesName',
+            dicData: [],
             rules: [
               {
-                pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
-                message: ' ',
-                trigger: 'blur'
-              },
-              {
                 required: false,
                 message: ' ',
                 trigger: 'blur'
@@ -513,11 +509,16 @@ export default {
             ]
           },
           {
-            label: '计划交期',
-            prop: 'plannedDeliveryDate',
-            type: 'datetime',
+            label: '已收金额',
+            prop: 'settlmentAmount',
+            disabled: true,
             rules: [
               {
+                pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
+                message: ' ',
+                trigger: 'blur'
+              },
+              {
                 required: false,
                 message: ' ',
                 trigger: 'blur'
@@ -549,9 +550,9 @@ export default {
             ]
           },
           {
-            label: '业务员',
-            prop: 'salesName',
-            dicData: [],
+            label: '计划交期',
+            prop: 'plannedDeliveryDate',
+            type: 'datetime',
             rules: [
               {
                 required: false,
@@ -766,7 +767,7 @@ export default {
       }
     },
     beforeBillData(bool,type){
-      this.billType = type ==="账单"? "销售收款结算":"销售申请退款"
+      this.billType = type ==="账单"? "销售收款":"销售申请退款"
       this.billData = {
         srcOrderno:this.form.orderNo,
         itemType:"销售",