修改bug

src/views/businessManagement/inventoryAccount/configuration/detail.json

@@ -31,7 +31,7 @@
       "label": "订单日期",
       "prop": "businesDate",
       "search": false,
-      "index": 1,
+      "index": 2,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
@@ -40,10 +40,17 @@
       "label": "客户名称",
       "prop": "corpsName",
       "search": false,
-      "index": 1,
+      "index": 3,
       "minWidth": 80,
       "overHidden": true,
       "searchSpan": 8
+    },
+    {
+      "label": "数量",
+      "prop": "orderQuantity",
+      "index": 4,
+      "minWidth": 80,
+      "overHidden": true
     }
   ]
 }

src/views/exportTrade/customerInquiry/detailsPage.vue

@@ -492,29 +492,6 @@ export default {
             ]
           },
           {
-            label: "日期条款",
-            prop: "dateClause",
-            span: 6,
-          },
-          {
-            label: "日期说明",
-            prop: "dateDesc",
-            type: "textarea",
-            minRows: 1,
-            span: 12,
-          },
-          {
-            label: "货物类型",
-            prop: "cargoType",
-            span: 6,
-            type: "select",
-            dicData: [],
-            props: {
-              label: "dictValue",
-              value: "dictValue"
-            }
-          },
-          {
             label: "起运港",
             prop: "portOfLoad",
             span: 6,
@@ -561,6 +538,30 @@ export default {
             props: {
               label: "dictValue",
               value: "dictValue"
+            },
+            row:true
+          },
+          {
+            label: "日期条款",
+            prop: "dateClause",
+            span: 6,
+          },
+          {
+            label: "日期说明",
+            prop: "dateDesc",
+            type: "textarea",
+            minRows: 1,
+            span: 12,
+          },
+          {
+            label: "货物类型",
+            prop: "cargoType",
+            span: 6,
+            type: "select",
+            dicData: [],
+            props: {
+              label: "dictValue",
+              value: "dictValue"
             }
           },
           {

src/views/exportTrade/salesContract/detailsPage.vue

@@ -555,29 +555,6 @@ export default {
           offset: 2
         },
         {
-          label: "日期条款",
-          prop: "dateClause",
-          span: 6,
-        },
-        {
-          label: "日期说明",
-          prop: "dateDesc",
-          type: "textarea",
-          minRows: 1,
-          span: 12,
-        },
-        {
-          label: "货物类型",
-          prop: "cargoType",
-          span: 6,
-          type: "select",
-          dicData: [],
-          props: {
-            label: "dictValue",
-            value: "dictValue"
-          }
-        },
-        {
           label: "起运港",
           prop: "portOfLoad",
           span: 6,
@@ -620,7 +597,8 @@ export default {
           props: {
             label: "dictValue",
             value: "dictValue"
-          }
+          },
+          row:true
         },
         {
           label: "价格条款",
@@ -628,6 +606,29 @@ export default {
           span: 6
         },
         {
+          label: "日期条款",
+          prop: "dateClause",
+          span: 6,
+        },
+        {
+          label: "日期说明",
+          prop: "dateDesc",
+          type: "textarea",
+          minRows: 1,
+          span: 12,
+        },
+        {
+          label: "货物类型",
+          prop: "cargoType",
+          span: 6,
+          type: "select",
+          dicData: [],
+          props: {
+            label: "dictValue",
+            value: "dictValue"
+          }
+        },
+        {
           label: "条款说明",
           prop: "priceTermsDescription",
           type: "textarea",

src/views/reimbursement/detail.vue

@@ -12,21 +12,22 @@
           @click.stop="openCheckDialog">
           审批
         </el-button>
-        <el-button v-if="form.status == 2 && tenantId == 681169 && roleName.indexOf('财务') !== -1" type="primary" size="small" class="el-button--small-yh"
-                   @click.stop="reimbursementCompleted">
+        <el-button v-if="form.status == 2 && tenantId == 681169 && roleName.indexOf('财务') !== -1" type="primary"
+          size="small" class="el-button--small-yh" @click.stop="reimbursementCompleted">
           报销完成
         </el-button>
         <el-button v-if="form.status > 0" @click.native="checkScheduleDialog = true, checkId = form.id" type="primary"
           size="small">审核进度</el-button>
         <el-button type="primary" v-if="!checkDisabled" :disabled="!form.id || disabled" size="small"
           @click="pleaseCheck" :loading="btnLoading">请核</el-button>
-          <el-button v-if="form.status == 3" type="primary" size="small" class="el-button--small-yh"
+        <el-button v-if="form.status == 3" type="primary" size="small" class="el-button--small-yh"
           @click.stop="openCheckDialog">
           报销
         </el-button>
         <el-button type="success" :disabled="!form.id" size="small" @click="copyDoc" :loading="btnLoading" v-if="false">
           复制单据</el-button>
-        <el-button type="primary" @click="editCustomer" size="small" :disabled="form.status > 0 && form.status !== 2" :loading="btnLoading">
+        <el-button type="primary" @click="editCustomer" size="small" :disabled="form.status > 0 && form.status !== 2"
+          :loading="btnLoading">
           保存数据</el-button>
       </div>
     </div>
@@ -35,45 +36,39 @@
         <avue-form ref="form" class="trading-form" v-model="form" :option="option">
           <template slot="userId">
             <el-select v-model="form.userId" filterable clearable size="small" placeholder="请选择" @change="userHandle"
-                       @clear="form.userName == null" :disabled="disabled || checkDisabled">
+              @clear="form.userName == null" :disabled="disabled || checkDisabled">
               <el-option v-for="(item, index) in userList" :key="index" :label="item.realName" :value="item.id">
               </el-option>
             </el-select>
           </template>
           <template slot="belongToCorpId">
-            <crop-select
-                v-model="form.belongToCorpId"
-                corpType="GS"
-                :disabled="disabled || checkDisabled"
-                @getCorpData="returnBack"
-                style="width: 100%"
-                ref="KHSelect"
-            ></crop-select>
+            <crop-select v-model="form.belongToCorpId" corpType="GS" :disabled="disabled || checkDisabled"
+              @getCorpData="returnBack" style="width: 100%" ref="KHSelect"></crop-select>
           </template>
           <template slot="deptId">
             <avue-input-tree leaf-only style="width: 100%;" size="small" :props="{ label: 'title' }"
-                             v-model="form.deptId" placeholder=" " type="tree" :dic="dic" :nodeClick="deptClick"
-                             :disabled="disabled || checkDisabled"></avue-input-tree>
+              v-model="form.deptId" placeholder=" " type="tree" :dic="dic" :nodeClick="deptClick"
+              :disabled="disabled || checkDisabled"></avue-input-tree>
           </template>
           <template slot="postId">
             <el-select v-model="form.postId" clearable filterable placeholder="请选择岗位" @change="postHandle"
-                       @clear="form.postId == null" :disabled="disabled || checkDisabled">
+              @clear="form.postId == null" :disabled="disabled || checkDisabled">
               <el-option v-for="(item, index) in postDic" :label="item.postName" :value="item.id" :key="index" />
             </el-select>
           </template>
         </avue-form>
       </trade-card>
       <trade-card title="报销明细">
-        <avue-crud ref="crud" :key="key" :data="dataList" :option="tableOption" :cell-style="cellStyle" @saveColumn="saveColumn"
-                   @resetColumn="resetColumn">
+        <avue-crud ref="crud" :key="key" :data="dataList" :option="tableOption" :cell-style="cellStyle"
+          @saveColumn="saveColumn" @resetColumn="resetColumn">
           <template slot="menuLeft">
             <el-button type="primary" icon="el-icon-plus" size="small" @click.stop="newDetails"
-                       :disabled="disabled || checkDisabled">录入明细</el-button>
+              :disabled="disabled || checkDisabled">录入明细</el-button>
             <el-button type="info" icon="el-icon-printer" size="small" @click="openReport">报表打印</el-button>
           </template>
           <template slot="detailId" slot-scope="{ row }">
             <el-select v-if="row.$cellEdit" v-model="row.detailId" filterable clearable @change="detailChange(row)"
-                       size="small">
+              size="small">
               <el-option v-for="(item, index) in row.feeList" :key="index" :label="item.cname" :value="item.id">
               </el-option>
             </el-select>
@@ -81,32 +76,33 @@
           </template>
           <template slot="menu" slot-scope="{ row, index }">
             <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
-                       :disabled="(disabled || checkDisabled) && form.status !== 2" v-if="form.status == 2 && tenantId == 681169 && roleName.indexOf('财务') !== -1">{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
+              :disabled="(disabled || checkDisabled) && form.status !== 2"
+              v-if="form.status == 2 && tenantId == 681169 && roleName.indexOf('财务') !== -1">{{ row.$cellEdit ? "保存" :
+              "修改" }}</el-button>
             <el-button size="small" icon="el-icon-edit" type="text" @click="rowCell(row, index)"
-                       :disabled="disabled || checkDisabled" v-else>{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
+              :disabled="disabled || checkDisabled" v-else>{{ row.$cellEdit ? "保存" : "修改" }}</el-button>
             <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)"
-                       :disabled="disabled || checkDisabled">删除</el-button>
+              :disabled="disabled || checkDisabled">删除</el-button>
           </template>
           <template slot="moldId" slot-scope="{ row }">
             <avue-cascader v-if="row.$cellEdit" v-model="row.moldId" size="small" style="width: 100%;" :dic="dicArea"
-                           :props="props" :disabled="disabled || checkDisabled" check-strictly :emit-path="false" :show-all-levels="false"
-                           @change="moldChange($event, row, dicArea)" @clear="row.feeList = feesOption" placeholder="请选择">
+              :props="props" :disabled="disabled || checkDisabled" check-strictly :emit-path="false"
+              :show-all-levels="false" @change="moldChange($event, row, dicArea)" @clear="row.feeList = feesOption"
+              placeholder="请选择">
             </avue-cascader>
             <span v-else>{{ row.mold }}</span>
           </template>
           <template slot="payMethod" slot-scope="{ row, index }">
             <el-select v-model="row.payMethod" size="small" placeholder="请选择" clearable :disabled="!row.$cellEdit">
               <el-option v-for="(item, index) in paymentOption" :key="index" :label="item.dictValue"
-                         :value="item.dictKey"></el-option>
+                :value="item.dictKey"></el-option>
             </el-select>
           </template>
         </avue-crud>
       </trade-card>
       <trade-card title="上传附件">
-        <c-upload :basic="true"
-                  :enumerationValue="107.1"
-                  :disabled="disabled || checkDisabled"
-                  :data="fileList"></c-upload>
+        <c-upload :basic="true" :enumerationValue="107.1" :disabled="disabled || checkDisabled" :data="fileList">
+        </c-upload>
       </trade-card>
       <trade-card title="付款信息" v-if="tenantId == 681169">
         <avue-form :option="optionTwo" v-model="form">
@@ -138,21 +134,21 @@ import {
   micrometerFormat,
   IntegerFormat
 } from "@/util/validate";
-import {gainUser, getCharge} from "@/api/basicData/customerInquiry";
+import { gainUser, getCharge } from "@/api/basicData/customerInquiry";
 import { getUserInfo } from "@/api/system/user";
 import { getDeptTree } from "@/api/system/dept";
 import { getCurrentDate } from "@/util/date";
 import { getList as getPostList } from "@/api/system/post";
-import { dataDetail, typeSave, removeGoods, pleaseCheck ,reimbursementModify} from "@/api/standAlone/reimbursement";
+import { dataDetail, typeSave, removeGoods, pleaseCheck, reimbursementModify } from "@/api/standAlone/reimbursement";
 import { contrastObj, contrastList } from "@/util/contrastData";
 import check from "@/components/check/check";
 import checkSchedule from "@/components/check/checkSchedule";
 import reportDialog from "@/components/report-dialog/main";
 import { getDeptTree as getFeesId, getFeesList } from "@/api/basicData/basicFeesDesc";
-import {customerList as getKHList, detail as khDetail} from "@/api/basicData/customerInformation";
-import {getCorpDetail} from "@/api/maintenance/overpayment";
-import {integralDetail} from "@/api/maintenance/integral";
-import {getlistBankBy, getProfit} from "@/api/basicData/configuration";
+import { customerList as getKHList, detail as khDetail } from "@/api/basicData/customerInformation";
+import { getCorpDetail } from "@/api/maintenance/overpayment";
+import { integralDetail } from "@/api/maintenance/integral";
+import { getlistBankBy, getProfit } from "@/api/basicData/configuration";
 import da from "element-ui/src/locale/lang/da";
 
 export default {
@@ -236,29 +232,30 @@ export default {
           {
             label: "实报金额",
             prop: "totalAmount",
+            disabled:true,
             span: 8,
             slot: true,
           },
           {
             label: "报销人银行户头",
             prop: "accountReimbursement",
-            type: 'select',
-            dicData:[],
-            filterable:true,
-            props: {
-              label: "accountName",
-              value: "id"
-            },
-            change:(data)=>{
-              let list = this.findObject(this.option.column, "accountReimbursement").dicData
-              for (let item of list){
-                if (data.value == item.id){
-                  this.form.accountReimbursement = data.value
-                  this.form.reimbursementAccountNo = item.accountBank
-                  this.form.bankOfDeposit = item.accountNo
-                }
-              }
-            },
+            // type: 'select',
+            // dicData: [],
+            filterable: true,
+            // props: {
+            //   label: "accountName",
+            //   value: "id"
+            // },
+            // change: (data) => {
+            //   let list = this.findObject(this.option.column, "accountReimbursement").dicData
+            //   for (let item of list) {
+            //     if (data.value == item.id) {
+            //       this.form.accountReimbursement = data.value
+            //       this.form.reimbursementAccountNo = item.accountBank
+            //       this.form.bankOfDeposit = item.accountNo
+            //     }
+            //   }
+            // },
             span: 8,
             slot: true,
           },
@@ -277,7 +274,7 @@ export default {
           {
             label: "系统编号",
             prop: "serialNo",
-            disabled:true,
+            disabled: true,
             span: 8,
             slot: true,
           },
@@ -319,15 +316,15 @@ export default {
             },
             span: 8,
             slot: true,
-          },{
+          }, {
             label: "实际付款金额",
             prop: "paymentAmount",
             span: 8,
             slot: true,
-          },{
+          }, {
             label: "给付人",
             prop: "dans",
-            filterable:true,
+            filterable: true,
             type: "select",
             props: {
               label: "realName",
@@ -335,18 +332,18 @@ export default {
             },
             span: 8,
             slot: true,
-          },{
+          }, {
             label: "财务出纳",
             prop: "financialCashier",
             type: "select",
-            filterable:true,
+            filterable: true,
             props: {
               label: "realName",
               value: "id"
             },
             span: 8,
             slot: true,
-          },{
+          }, {
             label: "科目编码",
             prop: "subjectCode",
             span: 8,
@@ -359,7 +356,7 @@ export default {
       goodsoptions: [],
       unitOption: [],
       paymentOption: [],
-      fileList:[],
+      fileList: [],
       selectionList: [],
       search: {},
       treeStyle: "height:" + (window.innerHeight - 315) + "px",
@@ -395,31 +392,36 @@ export default {
         label: 'title',
       },
       feesOption: [],
-      tableOptionBack:{},
-      key:0,
-      tenantId:JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id
+      tableOptionBack: {},
+      key: 0,
+      tenantId: JSON.parse(localStorage.getItem("saber-userInfo")).content.tenant_id
     }
   },
   async created() {
-    if (this.tenantId == '681169'){
+    if (this.tenantId == '681169') {
       this.tableOptionBack = tableOptionTwo
-    }else {
+    } else {
       this.tableOptionBack = tableOption
     }
     this.$set(this.form, 'claimDate', getCurrentDate()); // 默认当前日期
-    this.tableOption = await this.getColumnData(this.getColumnName(107),this.tableOptionBack);
-    this.findObject(this.tableOption.column, "quantity").change = (data)=>{
-      if (data.row.quantity && data.row.price){
-        data.row.amount = data.row.quantity * data.row.price
+    this.tableOption = await this.getColumnData(this.getColumnName(107), this.tableOptionBack);
+    if (this.tableOption.column.find(item => item.prop == "quantity")) {
+      this.findObject(this.tableOption.column, "quantity").change = (data) => {
+        if (data.row.quantity && data.row.price) {
+          data.row.amount = data.row.quantity * data.row.price
+        }
       }
     }
-    this.findObject(this.tableOption.column, "price").change = (data)=>{
-      if (data.row.quantity && data.row.price){
-        data.row.amount = data.row.quantity * data.row.price
+    if (this.tableOption.column.find(item => item.prop == "price")) {
+      this.findObject(this.tableOption.column, "price").change = (data) => {
+        if (data.row.quantity && data.row.price) {
+          data.row.amount = data.row.quantity * data.row.price
+        }
       }
     }
     this.key++
     gainUser().then(res => {
+      console.log(res)
       this.userList = res.data.data;
       this.findObject(this.optionTwo.column, "dans").dicData = res.data.data
       this.findObject(this.optionTwo.column, "financialCashier").dicData = res.data.data
@@ -429,36 +431,39 @@ export default {
       this.$set(this.form, 'userName', res.data.data.realName);
       this.$set(this.form, 'deptId', res.data.data.deptId);
       this.$set(this.form, 'deptName', res.data.data.deptName);
+      this.$set(this.form, 'bankOfDeposit', res.data.data.bankDeposit);
+      this.$set(this.form, 'accountReimbursement', res.data.data.bankAccount);
+      this.$set(this.form, 'reimbursementAccountNo', res.data.data.reimburseNumber);
       this.$set(this.form, 'postId', res.data.data.postId.split(',')[0]);
       this.$set(this.form, 'postName', res.data.data.postName.split(',')[0]);
       this.loginUser = res.data.data.realName;
-      if (this.form.status == 2){
-        if (this.roleName.indexOf('财务') !== -1){
+      if (this.form.status == 2) {
+        if (this.roleName.indexOf('财务') !== -1) {
           this.optionTwo.column.map(e => {
             this.$set(e, 'disabled', false)
           })
         }
         this.tableOption.column.map(e => {
-          if (this.roleName.indexOf('财务') !== -1){
-            if (e.prop == 'subjectName'){
+          if (this.roleName.indexOf('财务') !== -1) {
+            if (e.prop == 'subjectName') {
               this.$set(e, 'disabled', false)
-            }else if(e.prop == 'accountingItemsName'){
+            } else if (e.prop == 'accountingItemsName') {
               this.$set(e, 'disabled', false)
-            }else {
+            } else {
               this.$set(e, 'disabled', true)
             }
           }
         })
-      }else {
+      } else {
         this.optionTwo.column.map(e => {
           this.$set(e, 'disabled', true)
         })
         this.tableOption.column.map(e => {
-          if (e.prop == 'subjectName'){
+          if (e.prop == 'subjectName') {
             this.$set(e, 'disabled', true)
-          }else if(e.prop == 'accountingItemsName'){
+          } else if (e.prop == 'accountingItemsName') {
             this.$set(e, 'disabled', true)
-          }else {
+          } else {
             this.$set(e, 'disabled', false)
           }
         })
@@ -516,7 +521,7 @@ export default {
   },
   methods: {
     returnBack(row) {
-      getlistBankBy(row.id).then(res =>{
+      getlistBankBy(row.id).then(res => {
         console.log(res.data)
         this.findObject(this.option.column, "accountReimbursement").dicData = res.data
       })
@@ -536,8 +541,8 @@ export default {
           }
         })
         delete this.form.itemList;
-        this.oldForm =this.deepClone({ ...this.form });
-        this.oldDataList =this.deepClone([...this.dataList]);
+        this.oldForm = this.deepClone({ ...this.form });
+        this.oldDataList = this.deepClone([...this.dataList]);
         this.checkDisabled = this.form.status > 0 ? true : false;
         if (this.form.status > 0) {
           this.option.column.map(e => {
@@ -567,33 +572,33 @@ export default {
           }
         }
       })
-      if (this.form.status == 2){
-        if (this.roleName.indexOf('财务') !== -1){
+      if (this.form.status == 2) {
+        if (this.roleName.indexOf('财务') !== -1) {
           this.optionTwo.column.map(e => {
             this.$set(e, 'disabled', false)
           })
         }
         this.tableOption.column.map(e => {
-          if (this.roleName.indexOf('财务') !== -1){
-            if (e.prop == 'subjectName'){
+          if (this.roleName.indexOf('财务') !== -1) {
+            if (e.prop == 'subjectName') {
               this.$set(e, 'disabled', false)
-            }else if(e.prop == 'accountingItemsName'){
+            } else if (e.prop == 'accountingItemsName') {
               this.$set(e, 'disabled', false)
-            }else {
+            } else {
               this.$set(e, 'disabled', true)
             }
           }
         })
-      }else {
+      } else {
         this.optionTwo.column.map(e => {
           this.$set(e, 'disabled', true)
         })
         this.tableOption.column.map(e => {
-          if (e.prop == 'subjectName'){
+          if (e.prop == 'subjectName') {
             this.$set(e, 'disabled', true)
-          }else if(e.prop == 'accountingItemsName'){
+          } else if (e.prop == 'accountingItemsName') {
             this.$set(e, 'disabled', true)
-          }else {
+          } else {
             this.$set(e, 'disabled', false)
           }
         })
@@ -616,7 +621,7 @@ export default {
           this.$set(this.form, 'itemList', this.dataList)
           let formTwo = {
             ...this.form,
-            fileList:this.fileList
+            fileList: this.fileList
           }
           this.btnLoading = true;
           typeSave(formTwo).then(res => {
@@ -650,7 +655,7 @@ export default {
     async resetColumn() {
       this.tableOption = this.tableOptionBack;
       const inSave = await this.delColumnData(
-        this.getColumnName(107),this.tableOptionBack
+        this.getColumnName(107), this.tableOptionBack
       );
       if (inSave) {
         this.$nextTick(() => {
@@ -671,7 +676,7 @@ export default {
           this.dataList.push({
             $cellEdit: true,
             feeList: this.feesOption,
-            expenseOwner:this.form.userName
+            expenseOwner: this.form.userName
           })
         }
       })
@@ -712,8 +717,17 @@ export default {
       console.log(value)
       this.$set(row, "expenseItem", value.cname);
     },
-    userHandle() {
-      this.form.userName = this.userList.find(item => item.id == this.form.userId).realName;
+    userHandle(row) {
+      console.log()
+      this.userList.forEach(item=>{
+        if(row==item.id){
+          this.form.userName=item.realName
+          this.form.bankOfDeposit=item.bankDeposit
+          this.form.accountReimbursement=item.bankAccount
+          this.form.reimbursementAccountNo=item.reimburseNumber
+        }
+      })
+      // this.form.userName = this.userList.find(item => item.id == this.form.userId).realName;
     },
     postHandle() {
       this.form.postName = this.postDic.find(item => item.id == this.form.postId).postName;
@@ -739,14 +753,14 @@ export default {
       this.$set(this.form, 'deptName', data.title)
     },
     //报销完成
-    reimbursementCompleted(){
+    reimbursementCompleted() {
       this.$set(this.form, 'itemList', this.dataList)
       let formTwo = {
         ...this.form,
-        itemList:this.dataList,
-        fileList:this.fileList
+        itemList: this.dataList,
+        fileList: this.fileList
       }
-      reimbursementModify(formTwo).then(res=>{
+      reimbursementModify(formTwo).then(res => {
         this.$message.success('生成成功')
       })
     },
@@ -819,4 +833,5 @@ export default {
 </script>
 
 <style scoped>
+
 </style>