bug 财务

src/components/finance/applyPayment.vue

@@ -2,16 +2,31 @@
   <div>
     <div v-for="(item, index) in list" :key="index">
       <el-row>
-        <el-col :span="20"> <containerTitle title="账单"></containerTitle></el-col>
-        <el-col :span="4"><span class="delete_group" v-if="list.length !== 1"  @click="deleteGroup(index)">删除组</span></el-col>
+        <el-col :span="24"><span class="delete_group" v-if="list.length !== 1"  @click="deleteGroup(index)">删除组</span></el-col>
       </el-row>
       <basic-container>
         <avue-form :option="option" ref="form" v-model="item.form">
           <template slot-scope="scope" slot="corpId">
             <selectComponent v-model="corpId" :configuration="configuration"/>
           </template>
+          <template slot-scope="scope" slot="price">
+            <el-input
+              v-model="item.form.price"
+              autocomplete="off"
+              placeholder="请输入 单价"
+              @input="calculate(item.form)"
+            ></el-input>
+          </template>
+          <template slot-scope="scope" slot="quantity">
+            <el-input
+              v-model="item.form.quantity"
+              autocomplete="off"
+              placeholder="请输入 数量"
+              @input="calculate(item.form)"
+            ></el-input>
+          </template>
           <template slot-scope="scope" slot="currency">
-            <el-select v-model="item.form.currency" size="small" placeholder="请选择"  clearable filterable>
+            <el-select v-model="item.form.currency" size="small" placeholder="请选择 币别" @change="currencyChange(item.form)" clearable filterable>
               <el-option v-for="(item,index) in currencyDic" :key="index" :label="item.dictValue"  :value="item.dictValue"></el-option>
             </el-select>
           </template>
@@ -30,6 +45,7 @@
 
 <script>
   import { applyLoan,paymentApply } from "@/api/financialManagement/paymentRequest";
+  import _ from "lodash";
 
     export default {
       name: "applyPayment",
@@ -55,7 +71,7 @@
           configuration:{
             multipleChoices:false,
             multiple:false,
-            disabled:false,
+            disabled:true,
             searchShow:true,
             collapseTags:false,
             placeholder:'请点击右边按钮选择',
@@ -70,34 +86,79 @@
               {
                 label: '合同号',
                 prop: 'srcOrderno',
-                span: 12,
+                span: 8,
                 disabled:true,
-              },
-              {
-                label: '合同日期',
-                type:"date",
-                prop: 'accDate',
-                span: 12,
+                rules: [
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
+                  }
+                ]
               },
               {
                 label: '客户名称',
                 prop: 'corpId',
-                span: 12,
+                span: 16,
+                rules: [
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
+                  }
+                ]
+              },
+              {
+                label: '提单号',
+                prop: 'accDate',
+                span: 8,
+                rules: [
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
+                  }
+                ]
               },
               {
                 label: '费用名称',
                 prop: 'costType',
-                span: 12,
+                span: 8,
+                rules: [
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
+                  }
+                ]
+              },
+              {
+                label: '合同日期',
+                type:"date",
+                prop: 'accDate',
+                span: 8,
+                rules: [
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
+                  }
+                ]
               },
               {
                 label: '单价',
                 prop: 'price',
-                span: 12,
+                span: 8,
                 rules: [
                   {
                     pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                     message: ' ',
                     trigger: 'blur'
+                  },
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
                   }
                 ]
               },
@@ -105,46 +166,97 @@
                 label: '数量',
                 prop: 'quantity',
                 value:1,
-                span: 12,
+                span: 8,
                 rules: [
                   {
                     pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                     message: ' ',
                     trigger: 'blur'
+                  },
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
                   }
                 ]
               },
               {
                 label: '金额',
                 prop: 'amount',
-                span: 12,
+                span: 8,
                 rules: [
                   {
                     pattern: /(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/,
                     message: ' ',
                     trigger: 'blur'
+                  },
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
                   }
                 ]
               },
               {
                 label: '计价单位',
                 prop: 'unit',
-                span: 12,
+                type:"select",
+                span: 8,
+                rules: [
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
+                  }
+                ],
+                dicUrl: "/api/blade-system/dict-biz/dictionary?code=unit",
+                props: {
+                  label: "dictValue",
+                  value: "dictKey"
+                }
               },
               {
                 label: '币别',
                 prop: 'currency',
-                span: 12,
+                span: 8,
+                type:"select",
+                dicUrl: "/api/blade-system/dict-biz/dictionary?code=currency",
+                props: {
+                  label: "dictValue",
+                  value: "dictKey"
+                },
+                rules: [
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
+                  }
+                ]
               },
               {
                 label: '汇率',
                 prop: 'exchangeRate',
-                span: 12,
+                disabled:true,
+                span: 8,
+                rules: [
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
+                  }
+                ]
               },
               {
                 label: '税率',
                 prop: 'taxRate',
-                span: 12,
+                span: 8,
+                rules: [
+                  {
+                    required: true,
+                    message: ' ',
+                    trigger: 'blur'
+                  }
+                ]
               },
               {
                 label: '备注',
@@ -165,6 +277,8 @@
           this.currencyDic = res.data.data
         })
         this.form.form = this.billData
+        this.corpId =  this.billData.corpId
+        this.configuration.dicData = this.billData.corpsName
         this.addForm();
       },
       methods:{
@@ -175,27 +289,83 @@
         deleteGroup(index){
           this.list.splice(index, 1);
         },
-        submit(){
-          const itemsList =  this.list.map(item =>{ item.form.corpId = this.corpId; return item.form})
-          const params = {
-            billType : this.billType,
-            itemsList: itemsList
+        //计算单价  数量
+        calculate(valueForm){
+          if(valueForm.price && valueForm.quantity){
+            valueForm.amount = _.multiply(valueForm.price, valueForm.quantity).toFixed(2);
           }
-          if(this.billType === "销售"){  //销售订单 =>  账单明细
-            paymentApply(params).then(res=>{
-              if(res.data.success){
-                this.$message.success("操作成功!")
-                this.$emit("choceFun");
-              }
-            })
-          }else{ //采购订单 => 付款申请
-            applyLoan(params).then(res =>{
-              if(res.data.success){
-                this.$message.success("操作成功!")
-                this.$emit("choceFun");
-              }
-            })
+        },
+        //币别选择
+        currencyChange(valueForm){
+          if(valueForm.currency === "USD"){
+            valueForm.exchangeRate = 6.3686;
+          }else{
+            valueForm.exchangeRate = 1;
           }
+        },
+        async submit(){
+          let result = [];
+          await this.handleRulesValid(["form"],result)
+          if (result.some(item => item)) {
+            const itemsList =  this.list.map(item =>{ item.form.corpId = this.corpId; return item.form})
+            const params = {
+              billType : this.billType,
+              itemsList: itemsList
+            }
+            if(this.billType === "销售"){  //销售订单 =>  账单明细
+              paymentApply(params).then(res=>{
+                if(res.data.success){
+                  this.$message.success("操作成功!")
+                  this.$emit("choceFun");
+                }
+              })
+            }else{ //采购订单 => 付款申请
+              applyLoan(params).then(res =>{
+                if(res.data.success){
+                  this.$message.success("操作成功!")
+                  this.$emit("choceFun");
+                  //跳转付款申请页面
+
+
+                }
+              })
+            }
+          }
+        },
+        /**
+         * @param instance 实例
+         * @param result 校验结果数组
+         * 递归校验每个表格实例
+         */
+        handleValid(instance,result) {
+          if(!instance) {
+            result.push(true)
+          }else if(Array.isArray(instance)) {
+            instance.map(item => this.handleValid(item,result))
+          }else{
+            if(instance.validate) {
+              instance.validate(valid => {
+                result.push(valid)
+                instance.hide && instance.hide()
+              })
+            }else {
+              instance.validateCellForm().then(msg=>{
+                if((msg && !Object.keys(msg).length) || undefined === msg){
+                  result.push(true)
+                }else{
+                  result.push(false)
+                }
+              })
+            }
+
+          }
+        },
+        /**
+         * @param resultArr 校验结果数组
+         * 统一校验方法
+         */
+        handleRulesValid(refsList,resultArr) {
+          refsList.map(item => this.handleValid(this.$refs[`${item}`],resultArr))
         }
       }
     }

src/components/procurement/purchase.vue

@@ -13,7 +13,7 @@
     </avue-crud>
     <div style="margin-left: 80%;padding: 15px">
        <span slot="footer" class="dialog-footer" >
-           <el-button @click="closeFun">取 消</el-button>
+           <el-button @click="close">取 消</el-button>
            <el-button type="primary" @click="importProMent" :disabled="selectPromentList.length == 0">导入</el-button>
        </span>
     </div>
@@ -54,6 +54,9 @@
       refreshChange(){
         this.onLoad(this.page);
       },
+      close(){
+        this.$emit("closeFun")
+      },
       searchChange(params,done){
         this.onLoad(this.page, params);
         done()

src/views/basicData/basicFeesDesc/configuration/mainList.json

@@ -6,19 +6,22 @@
   "lazy": true,
   "tip": false,
   "simplePage": true,
+  "searchMenuPosition": "right",
   "searchShow": true,
   "searchMenuSpan": 6,
+  "searchSpan": 8,
   "tree": true,
   "selection": true,
   "viewBtn": true,
-  "menuWidth": 300,
+  "menuWidth": 220,
   "column": [
     {
       "label": "费用编号",
       "prop": "code",
       "search": true,
+      "overHidden": true,
       "index": 1,
-      "width": 100,
+      "width": 150,
       "rules": [
         {
           "required": true,
@@ -31,8 +34,9 @@
       "label": "费用名称",
       "prop": "cname",
       "search": true,
+      "overHidden": true,
       "index": 2,
-      "width": 100,
+      "width": 180,
       "rules": [
         {
           "required": true,
@@ -47,6 +51,7 @@
       "dicData": [],
       "type": "tree",
       "hide": true,
+      "overHidden": true,
       "addDisabled": false,
       "multiple": true,
       "props": {
@@ -62,35 +67,38 @@
       "label": "币别",
       "prop": "fcyno",
       "search": true,
+      "overHidden": true,
+      "type": "select",
       "index": 3,
-      "width": 100,
-      "rules": [
-        {
-          "required": false,
-          "message": "请输入币别",
-          "trigger": "blur"
-        }
-      ]
+      "width": 120,
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=currency",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      }
     },
     {
       "label": "计量单位",
       "prop": "unitno",
       "search": true,
+      "overHidden": true,
+      "type": "select",
       "index": 4,
-      "width": 100,
-      "rules": [{
-        "required": false,
-        "message": "请输入计量单位",
-        "trigger": "blur"
-      }]
+      "width": 120,
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=unit",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      }
     },
     {
       "label": "收付",
       "type": "select",
       "prop": "dc",
+      "overHidden": true,
       "search": true,
       "index": 5,
-      "width": 100,
+      "width": 120,
       "dicData": [{
         "label": "收",
         "value": "D"
@@ -108,9 +116,10 @@
     },
     {
       "label": "备注",
+      "overHidden": true,
       "prop": "remarks",
       "index": 6,
-      "width":100,
+      "width":200,
       "rules": [
         {
           "required": false,

src/views/basicData/basicFeesType/configuration/mainList.json

@@ -18,7 +18,7 @@
       "prop": "cname",
       "search": true,
       "index": 1,
-      "width": 100,
+      "width": 300,
       "rules": [
         {
           "required": true,
@@ -29,7 +29,7 @@
     },
     {
       "label": "创建时间",
-      "prop": "createTimeA",
+      "prop": "createTime",
       "type": "date",
       "format": "yyyy-MM-dd",
       "valueFormat": "yyyy-MM-dd",
@@ -37,7 +37,7 @@
       "search": true,
       "editDisplay":false,
       "index": 2,
-      "width": 100,
+      "width": 180,
       "rules": [
         {
           "required": true,

src/views/basicData/basicFeesType/index.vue

@@ -4,6 +4,7 @@
                :data="dataList"
                ref="crud"
                v-model="form"
+               :table-loading="loading"
                :page.sync="page"
                @row-del="rowDel"
                @row-update="rowUpdate"
@@ -41,6 +42,7 @@ export default {
     return {
       form: {},
       option: option,
+      loading:false,
       parentId:0,
       dataList: [],
       page: {
@@ -118,7 +120,6 @@ export default {
     },
     //新增子项和新增触发查询所有
     beforeOpen(done, type) {
-      console.log('1111')
       if (["add", "edit"].includes(type)) {
         this.initData();
       }
@@ -158,30 +159,33 @@ export default {
       console.log('1')
     },
     refreshChange() {
-      console.log('1')
+      this.onLoad(this.page);
     },
     onLoad(page, params = {}) {
-      const {createTimeA} = this.query;
+      this.loading = true;
+      const { createTime } = this.query;
       let values = {
         ...params,
         size:this.page.pageSize,
         current:this.page.currentPage
       };
-      if (createTimeA) {
+      if (createTime) {
         values = {
           ...params,
-          createTime: createTimeA[0] + ' 00:00:00',
-          endTime: createTimeA[1] + ' 23:59:59',
+          createStartTime: createTime[0] + ' 00:00:00',
+          createEndTime: createTime[1] + ' 23:59:59',
           size:this.page.pageSize,
           current:this.page.currentPage,
           ...this.query
         };
-        values.createTimeA = null;
+        values.createTime = null;
       }
       values.parentId = 0
       customerList(values).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
+      }).finally(()=>{
+        this.loading = false;
       })
     },
     //树桩列点击展开触发

src/views/basicData/basicStorageDesc/configuration/mainList.json

@@ -17,8 +17,9 @@
       "label": "库区编码",
       "prop": "code",
       "search": true,
+      "overHidden": true,
       "index": 1,
-      "width": 100,
+      "width": 120,
       "rules": [
         {
           "required": true,
@@ -31,8 +32,9 @@
       "label": "库区",
       "prop": "cname",
       "search": true,
+      "overHidden": true,
       "index": 2,
-      "width": 100,
+      "width": 120,
       "rules": [
         {
           "required": true,
@@ -42,11 +44,28 @@
       ]
     },
     {
+      "label": "仓库分类",
+      "prop": "storageTypeId",
+      "dicData": [],
+      "type": "tree",
+      "hide": true,
+      "multiple": true,
+      "props": {
+        "label": "title"
+      },
+      "rules": [{
+        "required": true,
+        "message": " ",
+        "trigger": "click"
+      }]
+    },
+    {
       "label": "地址",
       "prop": "addr",
       "search": true,
+      "overHidden": true,
       "index": 3,
-      "width": 100,
+      "width": 200,
       "rules": [
         {
           "required": false,
@@ -59,8 +78,9 @@
       "label": "联系人",
       "prop": "attn",
       "search": true,
+      "overHidden": true,
       "index": 4,
-      "width": 100,
+      "width": 120,
       "rules": [{
         "required": false,
         "message": "请输入联系人",
@@ -71,8 +91,9 @@
       "label": "电话",
       "prop": "tel",
       "search": true,
+      "overHidden": true,
       "index": 5,
-      "width": 100,
+      "width": 150,
       "rules": [{
         "required": false,
         "message": "请输入电话",
@@ -82,9 +103,18 @@
     {
       "label": "是否计费",
       "prop": "iffee",
+      "type": "select",
       "search": true,
+      "overHidden": true,
       "index": 6,
-      "width": 100,
+      "width": 120,
+      "dicData": [{
+        "label": "是",
+        "value": "0"
+      },{
+        "label": "否",
+        "value": "1"
+      }],
       "rules": [{
         "required": false,
         "message": "请输入是否计费",
@@ -95,8 +125,9 @@
       "label": "库容",
       "prop": "storageCapacity",
       "search": true,
+      "overHidden": true,
       "index": 7,
-      "width": 100,
+      "width": 130,
       "rules": [{
         "required": false,
         "message": "请输入库容",
@@ -104,30 +135,11 @@
       }]
     },
     {
-      "label": "仓库",
-      "prop": "storageTypeId",
-      "dicData": [],
-      "type": "tree",
-      "addDisabled": false,
-      "multiple": false,
-      "props": {
-        "label": "title"
-      },
-      "rules": [{
-        "required": true,
-        "message": " ",
-        "trigger": "click"
-      }],
-      "dicUrl": "/api/blade-system/tenant/select",
-      "hide": "!website.tenantMode",
-      "addDisplay": "website.tenantMode",
-      "editDisplay": "website.tenantMode",
-      "viewDisplay": "website.tenantMode"
-    },{
       "label": "备注",
       "prop": "remarks",
       "index": 8,
-      "width":100,
+      "overHidden": true,
+      "width":120,
       "rules": [
         {
           "required": false,

src/views/basicData/basicStorageDesc/index.vue

@@ -85,6 +85,13 @@ export default {
     //   this.dataList = res.data.data.records
     // })
   },
+  mounted() {
+    option.height = window.innerHeight - 350 ;
+    //查询服务类别字典项
+    getDeptTree().then(res => {
+      this.findObject(this.option.column, "storageTypeId").dicData = res.data.data;
+    });
+  },
   methods: {
     //展开主页左边类型
     nodeClick(data) {
@@ -139,7 +146,6 @@ export default {
     //查询全部
     initData(){
       getDeptTree().then(res => {
-        console.log(this.form);
         const column = this.findObject(this.option.column, "storageTypeId");
         column.dicData = res.data.data;
       });
@@ -154,9 +160,12 @@ export default {
     },
     //新增子项和新增触发查询所有
     beforeOpen(done, type) {
-      console.log('1111')
       if (["add", "edit"].includes(type)) {
-        this.initData();
+        this.option.column.forEach(e=>{
+          if(e.prop=='storageTypeId'){
+            this.$set(this.option.column,3,{...e,value:this.treeDeptId})
+          }
+        })
       }
       if (["edit", "view"].includes(type)) {
         detail(this.form.id).then(res => {
@@ -201,7 +210,6 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        this.initData()
       })
     },
     //树桩列点击展开触发
@@ -212,7 +220,31 @@ export default {
       });
     },
   }
+
 }
+// {
+//   "label": "仓库",
+//   "prop": "storageTypeId",
+//   "dicData": [],
+//   "type": "tree",
+//   "overHidden": true,
+//   "width":150,
+//   "addDisabled": false,
+//   "multiple": false,
+//   "props": {
+//   "label": "title"
+// },
+//   "rules": [{
+//   "required": true,
+//   "message": " ",
+//   "trigger": "click"
+// }],
+//   "dicUrl": "/api/blade-system/tenant/select",
+//   "hide": "!website.tenantMode",
+//   "addDisplay": "website.tenantMode",
+//   "editDisplay": "website.tenantMode",
+//   "viewDisplay": "website.tenantMode"
+// },
 </script>
 
 <style scoped>

src/views/basicData/basicStorageType/configuration/mainList.json

@@ -17,8 +17,9 @@
       "label": "仓库",
       "prop": "cname",
       "search": true,
+      "overHidden": true,
       "index": 1,
-      "width": 100,
+      "width": 120,
       "rules": [
         {
           "required": true,
@@ -31,8 +32,9 @@
       "label": "仓库编码",
       "prop": "code",
       "search": true,
+      "overHidden": true,
       "index": 2,
-      "width": 100,
+      "width": 150,
       "rules": [
         {
           "required": true,
@@ -46,6 +48,7 @@
       "prop": "parentId",
       "dicData": [],
       "type": "tree",
+      "overHidden": true,
       "hide": true,
       "addDisabled": false,
       "props": {
@@ -62,8 +65,9 @@
       "label": "地址",
       "prop": "addr",
       "search": true,
+      "overHidden": true,
       "index": 3,
-      "width": 100,
+      "width": 300,
       "rules": [
         {
           "required": false,
@@ -76,8 +80,9 @@
       "label": "联系人",
       "prop": "attn",
       "search": true,
+      "overHidden": true,
       "index": 4,
-      "width": 100,
+      "width": 150,
       "rules": [
         {
           "required": false,
@@ -91,7 +96,8 @@
       "prop": "tel",
       "search": true,
       "index": 5,
-      "width": 100,
+      "overHidden": true,
+      "width": 150,
       "rules": [
         {
           "required": false,
@@ -104,8 +110,9 @@
       "label": "库容",
       "prop": "storageCapacity",
       "search": true,
+      "overHidden": true,
       "index": 6,
-      "width": 100,
+      "width": 150,
       "rules": [
         {
           "required": false,
@@ -120,6 +127,7 @@
       "type": "number",
       "index": 7,
       "width": 60,
+      "overHidden": true,
       "rules": [{
         "required": true,
         "message": "请输入排序",
@@ -130,7 +138,8 @@
       "label": "备注",
       "prop": "remarks",
       "index": 8,
-      "width": 60,
+      "width": 100,
+      "overHidden": true,
       "rules": [{
         "required": false,
         "message": "请输入备注",

src/views/importTrade/invoice/detailsPageEdit.vue

@@ -635,8 +635,8 @@ export default {
         item.contractAmount = item.amount;
         item.actualQuantity = item.orderQuantity;
         item.singleton = {
-          BQ : _.divide(item.billWeight, item.orderQuantity),
-          IQ : _.divide(item.invoiceWeight, item.orderQuantity)
+          BQ :  item.billWeight && item.orderQuantity?_.divide(item.billWeight, item.orderQuantity):0,
+          IQ : item.invoiceWeight && item.orderQuantity?_.divide(item.invoiceWeight, item.orderQuantity):0
         }
         this.selectInventory(item);
         delete item.id

src/views/importTrade/receipt/detailsPageEdit.vue

@@ -241,7 +241,7 @@
       top="10vh"
       v-dialog-drag>
       <procurement-detail
-        @closeFun="!procurementDialog"
+        @closeFun="closeFun"
        @importProMent="importProMent"
       >
       </procurement-detail>
@@ -582,7 +582,7 @@ export default {
     },
     actualQuantityChange(row){
       if(row.singleton){
-        const _sing =   row.singleton
+        const _sing =  row.singleton
         if( _sing.BQ !== 0){  //如果有值并且不为空 计算码单与发票
           row.billWeight = _.multiply(_sing.BQ,row.actualQuantity)
         }
@@ -693,7 +693,7 @@ export default {
           if (this.contactsData[i].priceCategory === "") {
             return this.$message.error(`请输入第${i + 1}行的货物品种`);
           }
-          if (this.contactsData[i].actualQuantity === "") {
+          if (this.contactsData[i].actualQuantity === null) {
             return this.$message.error(`请输入第${i + 1}行的数量`);
           }
         }
@@ -778,13 +778,16 @@ export default {
     //导入采购明细
     importProMent(list){
       list.forEach((item,index) =>{
+        item.srcId = item.id;
         item.contractNumber = item.orderNo;
         item.contractAmount = item.amount;
         item.actualQuantity = item.orderQuantity;
         item.singleton = {
-          BQ : _.divide(item.billWeight, item.orderQuantity),
-          IQ : _.divide(item.invoiceWeight, item.orderQuantity)
+          BQ :  item.billWeight && item.orderQuantity?_.divide(item.billWeight, item.orderQuantity):0,
+          IQ : item.invoiceWeight && item.orderQuantity?_.divide(item.invoiceWeight, item.orderQuantity):0
         }
+        console.log(item.singleton)
+        delete item.id
         this.$refs.crudContact.rowCellAdd(item);
         this.selectInventory(item)
       })
@@ -828,6 +831,9 @@ export default {
         }
       })
     },
+    closeFun(){
+      this.procurementDialog = false
+    },
     //选择货物品种
     choice(row){
       this.dialogVisible = true;

src/views/purchase/contract/detailsPage.vue

@@ -281,9 +281,10 @@
     </el-dialog>
     <el-dialog
       append-to-body
+      title="账单"
       class="el-dialogDeep"
       :visible.sync="applyPaymentDialog"
-      width="60%"
+      width="70%"
       :close-on-click-modal="false"
       :destroy-on-close="true"
       :close-on-press-escape="false"
@@ -733,7 +734,7 @@ export default {
       })
     }else{
       this.$set(this.form,"currency","USD")
-      this.$set(this.form,"exchangeRate",6.3843)
+      this.$set(this.form,"exchangeRate",6.3686)
     }
   },
   components: {
@@ -767,8 +768,8 @@ export default {
           this.form.exchangeRate = 1
           this.$set(this.form,"rmbAmount",this.form.orderAmount)
         }else{
-          this.form.exchangeRate = 6.3843
-          this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, 6.3843).toFixed(2))
+          this.form.exchangeRate = 6.3686
+          this.$set(this.form,"rmbAmount",_.multiply(this.form.orderAmount, 6.3686).toFixed(2))
         }
       }else{
         this.$set(this.form,"rmbAmount","")
@@ -948,6 +949,8 @@ export default {
       this.billData = {
         srcOrderno:this.form.orderNo,
         itemType:"采购",
+        corpsName:this.form.corpsName,
+        corpId:this.form.corpId,
         accDate:this.form.businesDate,
         currency:this.form.currency,
         exchangeRate:this.form.exchangeRate,

src/views/workManagement/main-items/configuration/mainList.json

@@ -42,6 +42,7 @@
     {
       "label": "客户名称",
       "prop": "corpId",
+      "searchSpan": 12,
       "search": true,
       "hide": true
     },