货代bug和科目菜单 2024-1-10

src/views/billM/billingCenter/index.vue

@@ -260,8 +260,10 @@
               width:"180",
               overHidden:true,
               type:'select',
+              filterable:true,
               remote:true,
               dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+              dicData:[],
               props: {
                   label: 'cnName',
                   value: 'cnName',
@@ -277,7 +279,9 @@
               width:"180",
               overHidden:true,
               type:'select',
+              filterable:true,
               remote:true,
+              dicData:[],
               dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
               props: {
                   label: 'cnName',
@@ -654,8 +658,15 @@
     },
     async created() {
       this.option = await this.getColumnData(this.getColumnName(313), this.optionBack);
+      this.getBcorpslistByTypefun()
     },
     methods: {
+      getBcorpslistByTypefun(){
+          getBcorpslistByType(1,10).then(res=>{
+              this.findObject(this.option.column, "corpCnName").dicData = res.data.data.records
+              this.findObject(this.option.column, "billCorpCnName").dicData = res.data.data.records
+          })
+      },
       rowSave(row, done, loading) {
         add(row).then(() => {
           this.onLoad(this.page);

src/views/iosBasicData/SeafreightExportF/bills/assembly/feecenter.vue

@@ -1589,6 +1589,21 @@
             },
             // 批量删除
             batchDelete(dc){
+                if(dc == 'D') {
+                    for(let item of this.selectionDList) {
+                        if (item.accStatus == 1){
+                            this.$message.warning('请选择没有生成账单的数据')
+                            return
+                        }
+                    }
+                }else {
+                    for(let item of this.feeCenterListC) {
+                        if (item.accStatus == 1){
+                            this.$message.warning('请选择没有生成账单的数据')
+                            return
+                        }
+                    }
+                }
                 this.$confirm("确定将选择数据删除?", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
@@ -1928,7 +1943,6 @@
             // 获取预付到付字典数据
             paymodeWorkDictsfun(){
                 getWorkDicts('payment_method_los').then((res) => {
-                    console.log(res,1768)
                     this.paymodeData = res.data.data
                 })
             },

src/views/iosBasicData/SeafreightExportF/bills/assembly/formbottom.vue

@@ -27,10 +27,21 @@
                             <span slot="label">
                                 <span style="color: #1e9fff">联系人</span>
                             </span>
-                            <el-input type="age" style="width: 100%;" v-model="assemblyForm.cyContacts"
-                                      size="small" autocomplete="off"
-                                      :disabled="detailData.seeDisabled || generateBillsfalse"
-                                      clearable placeholder="请输入联系人" ></el-input>
+                            <!--<el-input type="age" style="width: 100%;" v-model="assemblyForm.cyContacts"-->
+                            <!--          size="small" autocomplete="off"-->
+                            <!--          :disabled="detailData.seeDisabled || generateBillsfalse"-->
+                            <!--          clearable placeholder="请输入联系人" ></el-input>-->
+                            <search-query :datalist="cyContactsData"
+                                          :selectValue="assemblyForm.cyContacts"
+                                          :filterable="true"
+                                          :clearable="true"
+                                          :disabled="detailData.seeDisabled || generateBillsfalse"
+                                          :buttonIf="false"
+                                          :forParameter="{key:'id',label:'cname',value:'cname'}"
+                                          placeholder="请选择联系人"
+                                          @corpChange="corpChange($event,'cyContacts')"
+                                          @corpFocus="remoteMethod($event, 'cyContacts')" >
+                            </search-query>
                         </el-form-item>
                     </el-col>
                 </el-col>
@@ -407,6 +418,7 @@
     import {getWorkDicts} from "@/api/system/dictbiz";
     import {bportsList} from "@/api/iosBasicData/bports";
     import emailhash from '@/views/iosBasicData/SeafreightExportF/bills/assembly/Jsonfile/emailhash.json'
+    import {getBcorpsattnList} from "@/api/iosBasicData/bcorpsattn";
 
     export default {
         components: {SearchQuery},
@@ -428,6 +440,7 @@
                 emailhash:emailhash, // 邮箱跳转地址
                 // 场站
                 cyData:[],
+                cyContactsData:[], // 场站联系人
                 // 服务方式
                 serviceTermsData:[],
                 // HB/L付款地点数据
@@ -501,6 +514,10 @@
                     // 签单方式
                     this.getWorkDictsfun()
                 }
+                // 场站联系人
+                else if (name == 'cyContacts') {
+                    this.cyBcorpsattnListfun()
+                }
                 // 份数
                 else if (numberOfArr.indexOf(name) != -1) {
                     this.numberoforiginalWorkDicts()
@@ -522,16 +539,28 @@
                 if (name == 'cy') {
                     for(let item of this.cyData) {
                         if (item.cnName == value) {
-                            console.log(item,520)
                             this.$set(this.assemblyForm,'cyId',item.id)
                             this.$set(this.assemblyForm,'cyCode',item.code)
                             this.$set(this.assemblyForm,'cyCnName',item.cnName)
                             this.$set(this.assemblyForm,'cyEnName',item.enName)
-                            this.$set(this.assemblyForm,'cyTel',item.tel)
-                            this.$set(this.assemblyForm,'cyRemarks',item.remarks)
+                            this.$set(this.assemblyForm,'cyRemarks',item.details) // 客户里的详情信息
 
-                            this.$set(this.assemblyForm,'cyAddress',item.address)
-                            this.$set(this.assemblyForm,'cyContacts',item.contacts)
+                            // 查询场站联系人
+                            getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
+                                this.$set(this.assemblyForm,'cyTel',res.data.data.records[0].tel)
+                                this.$set(this.assemblyForm,'cyAddress',res.data.data.records[0].addr)
+                                this.$set(this.assemblyForm,'cyContacts',res.data.data.records[0].cname)
+                            })
+                        }
+                    }
+                }
+                // 场站联系人
+                else if (name == 'cyContacts') {
+                    for(let item of this.cyContactsData) {
+                        if (item.cname == value) {
+                            this.$set(this.assemblyForm,'cyTel',item.tel)
+                            this.$set(this.assemblyForm,'cyAddress',item.addr)
+                            this.$set(this.assemblyForm,'cyContacts',item.cname)
                         }
                     }
                 }
@@ -628,6 +657,12 @@
                     this.cyData = res.data.data.records
                 })
             },
+            // 获取场站下的联系人数据
+            cyBcorpsattnListfun(){
+                getBcorpsattnList(1,20,{pid:this.assemblyForm.cyId}).then(res=>{
+                    this.cyContactsData = res.data.data.records
+                })
+            },
             // 获取客户数据
             inttraBcorpslistByType(cnName){
                 getBcorpslistByType(1,10,{cnName}).then(res=>{

src/views/iosBasicData/SeafreightExportF/bills/assembly/reports.vue

@@ -77,6 +77,10 @@
       reportContainer
     },
     props: {
+      assemblyForm:{
+          type:Object,
+          default:{}
+      },
       id: {
         type: String
       },
@@ -645,6 +649,7 @@
           // 是创建一个 Stimulsoft 报表查看器的实例的代码
           let viewer = new Stimulsoft.Viewer.StiViewer(options, 'StiViewer', false)
 
+
           // 报表
           console.log("创建一个报表实例");
           let report = new window.Stimulsoft.Report.StiReport();
@@ -654,6 +659,9 @@
           // report.loadFile("/reports/stimulsoft/demos/SimpleList.mrt");
           report.load(url)
 
+          // 获取报告文件名更改文件名称
+          report.reportAlias = this.assemblyForm.corpCnName.split(' - ')[0] + '-' + this.assemblyForm.mblno
+          // report.reportName = '12313'
 
           // 获取报表数据
           // const res = await reportsGetReportData({

src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -234,7 +234,7 @@
                                     <mbinformation :assemblyForm="form" :detailData="detailData"></mbinformation>
                                 </el-tab-pane>
                                 <el-tab-pane label="报表管理" name="fourth">
-                                    <reports :id="form.id" :disabled="detailData.seeDisabled" businessValue="HYCK"></reports>
+                                    <reports :id="form.id" :assemblyForm="form" :disabled="detailData.seeDisabled" businessValue="HYCK"></reports>
                                 </el-tab-pane>
                                 <el-tab-pane label="EDI CODE" name="sixth">
                                     <edicode :assemblyForm="form" :detailData="detailData"></edicode>
@@ -903,12 +903,15 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                 } else if (name == 'srcCnName') {
                     if (this.form.srcType == 'SALES') {
                         // 业务员
+                        this.columnforfun('srcCnName').forParameter = { key:'id', label:'name', value:'name'}
                         this.salesUserGetListfun(value)
                     }else if (this.form.srcType == 'AGENT') {
                         // 代理
+                        this.columnforfun('srcCnName').forParameter = { key:'id', label:'cnName', value:'cnName'}
                         this.agentBcorpsListfun(value)
                     }else if (this.form.srcType == 'OWN') {
                         // 公司
+                        this.columnforfun('srcCnName').forParameter = { key:'id', label:'title', value:'title'}
                         this.ownDeptLazyTreefun()
                     }else {}
                 }else {
@@ -1337,6 +1340,21 @@ import {editypesList} from "@/api/iosBasicData/editypes";
                     row.podCnName = this.form.podCnName // 卸货港中文名称
                     row.podEnName = this.form.podEnName // 卸货港英文名称
                     row.corpArgreementNo = this.form.corpArgreementNo // 客户约号
+                    // 数量 * 单价 = 净额
+                    // 总税率 = 税率 + 附件税率
+                    // 税额 = 净额 * 总税率
+                    // 含税
+                    if (row.curCode == 'CNY') {
+                        row.amount = row.rmbAmount?row.rmbAmount:(Number(row.quantity) * Number(row.price)).toFixed(2)
+                    }else {
+                        row.amount = row.usdAmount?row.usdAmount:(Number(row.quantity) * Number(row.price)).toFixed(2)
+                    }
+                    // 净额
+                    if (row.curCode == 'CNY') {
+                        row.amountNet = row.rmbAmountNet?row.rmbAmountNet:(Number(row.quantity) * Number(row.price)).toFixed(2)
+                    }else {
+                        row.amountNet = row.usdAmountNet?row.usdAmountNet:(Number(row.quantity) * Number(row.price)).toFixed(2)
+                    }
                 })
                 this.pageLoading = true
                 billsSubmit(this.form).then(res=>{

src/views/iosBasicData/accounts/index.vue

@@ -22,7 +22,8 @@
                      @refresh-change="refreshChange"
                      @resetColumn="resetColumnTwo('crud', 'option', 'optionBack', 323)"
                      @saveColumn="saveColumnTwo('crud', 'option', 'optionBack', 323)"
-                     @on-load="onLoad">
+                     @on-load="onLoad"
+                     @tree-load="treeLoad" >
               <template slot="menuLeft">
                   <el-button type="primary"
                              size="small"
@@ -46,13 +47,27 @@
               </template>
               <template slot="menu" slot-scope="{ row, index }">
                   <el-button size="small" icon="el-icon-edit" type="text" @click="editfun(row,index)">编辑</el-button>
-                  <el-button v-if="row.isItem == 1" size="small" type="text" @click="editOpeningfun(row,index)">核算期初</el-button>
-                  <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)">删 除
-                  </el-button>
+                  <!--<el-button v-if="row.isItem == 1" size="small" type="text" @click="editOpeningfun(row,index)">核算期初</el-button>-->
+                  <el-button size="small" type="text" @click="addChildfun(row,index)">添加子项</el-button>
+                  <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)">删 除</el-button>
               </template>
               <template slot="code" slot-scope="{ row }">
                   <span style="color: #1e9fff" @click="editDetailsfun(row.id)">{{row.code}}</span>
               </template>
+              <template slot="isItem" slot-scope="{ row }">
+                  <span class="pointerClick" v-if="row.isItem == 1" @click="editOpeningfun(row)" >是</span>
+                  <span v-else >否</span>
+              </template>
+              <template slot="quantityOpenDr" slot-scope="{ row }">
+                  <el-input style="width: 100%;" v-model="row.quantityOpenDr"
+                            v-if="row.edit" type="number" min="0"
+                            size="mini" autocomplete="off" clearable
+                            placeholder="请输入期初借方数量" >
+                  </el-input>
+                  <span v-else >{{row.quantityOpenDr}}</span>
+              </template>
+
+
 
           </avue-crud>
       </basic-container>
@@ -65,7 +80,7 @@
           class="el-dialogDeep"
           width="60%"
           :before-close="handleClose">
-          <accounts-dialog :form="form"></accounts-dialog>
+          <accounts-dialog ref="accountsDialog" :form="form"></accounts-dialog>
           <span slot="footer" class="dialog-footer">
                 <el-button @click="accountsVisible = false">取 消</el-button>
                 <el-button type="primary" @click="bigSavefun">确 定</el-button>
@@ -87,7 +102,6 @@
           </span>
       </el-dialog>
 
-
       <!--<accountsDetails v-if="!isShow" @goBack="goBack"></accountsDetails>-->
   </div>
 </template>
@@ -130,6 +144,13 @@
           selection: true,
           dialogClickModal: false,
           menuWidth:"200",
+          lazy: true,
+          tree: true,
+          rowKey:'code',
+          rowParentKey:'children',
+          simplePage: true,
+          searchIcon:true,
+          searchIndex:2,
           column: [
             {
               label: "科目代码",
@@ -150,6 +171,8 @@
               prop: "dc",
               overHidden: true,
               type:'select',
+              search: true,
+                width: "50",
               dicData:[
                   {
                       label:'借方',
@@ -165,7 +188,9 @@
               label: "外币",
               prop: "isForeign",
               overHidden: true,
+              search: true,
               type:'select',
+                width: "35",
               dicData:[
                   {
                       label:'否',
@@ -181,12 +206,16 @@
               label: "币种",
               prop: "curCode",
               overHidden: true,
+              search: true,
+                width: "50",
             },
             {
               label: "数量",
               prop: "isQuantity",
               overHidden: true,
+              search: true,
               type:'select',
+                width: "35",
               dicData:[
                   {
                       label:'否',
@@ -202,7 +231,9 @@
               label: "客户",
               prop: "isCorp",
               overHidden: true,
+              search: true,
               type:'select',
+                width: "35",
               dicData:[
                   {
                       label:'否',
@@ -218,7 +249,9 @@
               label: "部门",
               prop: "isDept",
               overHidden: true,
+              search: true,
               type:'select',
+                width: "35",
               dicData:[
                   {
                       label:'否',
@@ -234,7 +267,9 @@
               label: "职员",
               prop: "isEmpl",
               overHidden: true,
+              search: true,
               type:'select',
+                width: "35",
               dicData:[
                   {
                       label:'否',
@@ -250,7 +285,9 @@
               label: "项目",
               prop: "isItem",
               overHidden: true,
+              search: true,
               type:'select',
+                width: "35",
               dicData:[
                   {
                       label:'否',
@@ -263,180 +300,114 @@
               ]
             },
             {
-              label: "期初本币借方金额",
-              prop: "amountOpenDr",
-              rules: [{
-                required: true,
-                message: "请输入期初本币借方金额",
-                trigger: "blur"
-              }]
+                label: "上级科目",
+                prop: "parentCode",
+                overHidden: true,
             },
+              // {
+              //     label: "children",
+              //     prop: "children",
+              //     hasChildren:true,
+              // },
             {
-              label: "期初本币贷方金额",
-              prop: "amountOpenCr",
-              rules: [{
-                required: true,
-                message: "请输入期初本币贷方金额",
-                trigger: "blur"
-              }]
-            },
-            {
-              label: "期初本币余额",
-              prop: "amountOpenBlc",
-              rules: [{
-                required: true,
-                message: "请输入期初本币余额",
-                trigger: "blur"
-              }]
+                label: "期初数量借方",
+                prop: "quantityOpenDr",
+                overHidden: true,
             },
             {
-              label: "本期本币借方金额",
-              prop: "amountDr",
-              rules: [{
-                required: true,
-                message: "请输入本期本币借方金额",
-                trigger: "blur"
-              }]
+              label: "期初本币借方金额",
+              prop: "amountOpenDr",
+              overHidden: true,
             },
             {
-              label: "本期本币贷方金额",
-              prop: "amountCr",
-              rules: [{
-                required: true,
-                message: "请输入本期本币贷方金额",
-                trigger: "blur"
-              }]
+              label: "期初外币借方金额",
+              prop: "amountOpenDrUsd",
+              overHidden: true,
             },
             {
-              label: "本期本币余额",
-              prop: "amountBlc",
-              rules: [{
-                required: true,
-                message: "请输入本期本币余额",
-                trigger: "blur"
-              }]
+                label: "期初数量贷方",
+                prop: "quantityOpenCr",
+                overHidden: true,
             },
             {
-              label: "期初外币借方金额",
-              prop: "amountOpenDrUsd",
-              rules: [{
-                required: true,
-                message: "请输入期初外币借方金额",
-                trigger: "blur"
-              }]
+              label: "期初本币贷方金额",
+              prop: "amountOpenCr",
+              overHidden: true,
             },
             {
               label: "期初外币贷方金额",
               prop: "amountOpenCrUsd",
-              rules: [{
-                required: true,
-                message: "请输入期初外币贷方金额",
-                trigger: "blur"
-              }]
+              overHidden: true,
             },
             {
-              label: "期初外币期初余额",
-              prop: "amountOpenUsdBlc",
-              rules: [{
-                required: true,
-                message: "请输入期初外币期初余额",
-                trigger: "blur"
-              }]
+                label: "期初数量余额",
+                prop: "quantityOpenUsdBlc",
+                overHidden: true,
             },
             {
-              label: "本期外币借方金额",
-              prop: "amountDrUsd",
-              rules: [{
-                required: true,
-                message: "请输入本期外币借方金额",
-                trigger: "blur"
-              }]
+              label: "期初本币余额",
+              prop: "amountOpenBlc",
+              overHidden: true,
             },
             {
-              label: "本期外币贷方金额",
-              prop: "amountCrUsd",
-              rules: [{
-                required: true,
-                message: "请输入本期外币贷方金额",
-                trigger: "blur"
-              }]
+                label: "期初外币余额",
+                prop: "amountOpenUsdBlc",
+                overHidden: true,
             },
             {
-              label: "本期外币期初余额",
-              prop: "amountUsdBlc",
-              rules: [{
-                required: true,
-                message: "请输入本期外币期初余额",
-                trigger: "blur"
-              }]
+                label: "本期数量借方",
+                prop: "quantityDr",
+                overHidden: true,
             },
             {
-              label: "期初数量借方金额",
-              prop: "quantityOpenDr",
-              rules: [{
-                required: true,
-                message: "请输入期初数量借方金额",
-                trigger: "blur"
-              }]
+              label: "本期本币借方金额",
+              prop: "amountDr",
+              overHidden: true,
             },
             {
-              label: "期初数量贷方金额",
-              prop: "quantityOpenCr",
-              rules: [{
-                required: true,
-                message: "请输入期初数量贷方金额",
-                trigger: "blur"
-              }]
+                label: "本期外币借方金额",
+                prop: "amountDrUsd",
+                overHidden: true,
             },
             {
-              label: "期初数量期初余额",
-              prop: "quantityOpenUsdBlc",
-              rules: [{
-                required: true,
-                message: "请输入期初数量期初余额",
-                trigger: "blur"
-              }]
+                label: "本期数量贷方",
+                prop: "quantityCr",
+                overHidden: true,
             },
             {
-              label: "本期数量借方金额",
-              prop: "quantityDr",
-              rules: [{
-                required: true,
-                message: "请输入本期数量借方金额",
-                trigger: "blur"
-              }]
+              label: "本期本币贷方金额",
+              prop: "amountCr",
+              overHidden: true,
             },
             {
-              label: "本期数量贷方金额",
-              prop: "quantityCr",
-              rules: [{
-                required: true,
-                message: "请输入本期数量贷方金额",
-                trigger: "blur"
-              }]
+                label: "本期外币贷方金额",
+                prop: "amountCrUsd",
+                overHidden: true,
             },
             {
-              label: "本期数量期初余额",
-              prop: "quantityUsdBlc",
-              rules: [{
-                required: true,
-                message: "请输入本期数量期初余额",
-                trigger: "blur"
-              }]
+                label: "本期数量余额",
+                prop: "quantityUsdBlc",
+                overHidden: true,
+            },
+            {
+              label: "本期本币余额",
+              prop: "amountBlc",
+              overHidden: true,
+            },
+            {
+              label: "本期外币余额",
+              prop: "amountUsdBlc",
+              overHidden: true,
             },
             {
               label: "备注",
               prop: "remarks",
-              rules: [{
-                required: true,
-                message: "请输入备注",
-                trigger: "blur"
-              }]
+              overHidden: true,
             },
           ]
         },
         data: [],
-          propertyData:[], // 科目类别
+        propertyData:[], // 科目类别
       };
     },
     components:{accitemsopenblc, accountsDialog,accountsDetails},
@@ -482,8 +453,10 @@
       },
         // 编辑
         editDetailsfun(id){
+            // 详情接口
             accountsDetail(id).then(res => {
                 this.form = res.data.data;
+                this.$set(this.form,'property',this.form.property + '')
             });
             this.accountsVisible = true
         },
@@ -572,8 +545,21 @@
         editfun(row){
             accountsDetail(row.id).then(res => {
                 this.form = res.data.data;
+                this.$set(this.form,'property',this.form.property + '')
             });
             this.accountsVisible = true
+            this.$nextTick(()=>{
+                this.$refs.accountsDialog.propertyWorkDictsfun()
+            })
+        },
+        // 添加子项
+        addChildfun(row){
+            this.form = {
+                parentId:row.id,
+                parentCode:row.code,
+                parentCnName:row.cnName,
+            }
+            this.accountsVisible = true
         },
         // 核算期初
         editOpeningfun(row){
@@ -651,6 +637,11 @@
           this.selectionClear();
         });
       },
+      // 懒加载查询子节点数据
+      treeLoad(row, treeNode, resolve){
+          console.log(row,688)
+          console.log(row,treeNode,resolve,673)
+      },
       // 详情的返回列表
       goBack() {
           // 初始化数据
@@ -713,4 +704,8 @@
     background: #ecf5ff !important;
     text-align: center;
 }
+.pointerClick {
+    cursor:pointer;
+    color: #1e9fff;
+}
 </style>

src/views/iosBasicData/finstlbills/finstlbillsDetails.vue

@@ -525,10 +525,10 @@
                 // 收 / 付
                 dcData:[
                     {
-                        label:'Debit',
+                        label:'收',
                         value: 'D'
                     },{
-                        label:'Credit',
+                        label:'付',
                         value: 'C'
                     }
                 ],

src/views/iosBasicData/finvouchers/finvouchersitems.vue

@@ -143,7 +143,7 @@
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label="借方金额:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                                <el-input style="width: 100%;" v-model="subjectRow.amountDrUsd"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入借方金额" >
                                 </el-input>
@@ -151,7 +151,7 @@
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label="贷方金额:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                                <el-input style="width: 100%;" v-model="subjectRow.amountCrUsd"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入贷方金额" >
                                 </el-input>
@@ -159,7 +159,7 @@
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label="本币借方:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                                <el-input style="width: 100%;" v-model="subjectRow.amountDr"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入本币借方" >
                                 </el-input>
@@ -167,7 +167,7 @@
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label="本币贷方:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                                <el-input style="width: 100%;" v-model="subjectRow.amountCr"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入本币贷方" >
                                 </el-input>
@@ -178,7 +178,7 @@
                     <el-row>
                         <el-col :span="4">
                             <el-form-item label="单位:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.unitNO"
+                                <el-input style="width: 100%;" v-model="subjectRow.unitNo"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入单位" >
                                 </el-input>
@@ -194,7 +194,7 @@
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label="借方数量:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                                <el-input style="width: 100%;" v-model="subjectRow.quantityDr"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入借方数量" >
                                 </el-input>
@@ -210,7 +210,7 @@
                         </el-col>
                         <el-col :span="4">
                             <el-form-item label="贷方数量:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                                <el-input style="width: 100%;" v-model="subjectRow.quantityCr"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入贷方数量" >
                                 </el-input>
@@ -229,8 +229,8 @@
                     <el-row :gutter="40">
                         <el-col :span="12" v-if="subjectAccount.isCorp">
                             <div>客户核算：</div>
-                            <el-form-item label="本币贷方:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                            <el-form-item label="客户名称:" prop="voucherType">
+                                <el-input style="width: 100%;" v-model="subjectRow.corpCnName"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入客户名称" >
                                 </el-input>
@@ -238,8 +238,8 @@
                         </el-col>
                         <el-col :span="12" v-if="subjectAccount.isDept">
                             <div>部门核算：</div>
-                            <el-form-item label="本币贷方:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                            <el-form-item label="部门名称:" prop="voucherType">
+                                <el-input style="width: 100%;" v-model="subjectRow.deptName"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入部门名称" >
                                 </el-input>
@@ -247,8 +247,8 @@
                         </el-col>
                         <el-col :span="12" v-if="subjectAccount.isEmpl">
                             <div>职员核算：</div>
-                            <el-form-item label="本币贷方:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                            <el-form-item label="职员名称:" prop="voucherType">
+                                <el-input style="width: 100%;" v-model="subjectRow.emplName"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入职员名称" >
                                 </el-input>
@@ -256,8 +256,8 @@
                         </el-col>
                         <el-col :span="12" v-if="subjectAccount.isItem">
                             <div>项目核算：</div>
-                            <el-form-item label="本币贷方:" prop="voucherType">
-                                <el-input style="width: 100%;" v-model="subjectRow.voucherNo"
+                            <el-form-item label="项目名称:" prop="voucherType">
+                                <el-input style="width: 100%;" v-model="subjectRow.itemName"
                                           size="small" autocomplete="off"
                                           clearable placeholder="请输入项目名称" >
                                 </el-input>
@@ -269,7 +269,7 @@
             </div>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="auxiliaryVisible = false">取 消</el-button>
-                <el-button type="primary" @click="auxiliaryVisible = false">确 定</el-button>
+                <el-button type="primary" @click="auxiliaryDeterminefun">确 定</el-button>
             </span>
         </el-dialog>
 
@@ -357,7 +357,6 @@
             },
             // 科目编辑打开辅助核算弹窗
             auxiliaryAccountingfun(row){
-                console.log(row,352)
                 // 获取状态
                 accountsDetail(row.accountId).then(res=>{
                     this.subjectAccount = res.data.data
@@ -365,6 +364,11 @@
                 this.subjectRow = row
                 this.auxiliaryVisible = true
             },
+            // 辅助核算弹窗确认按钮
+            auxiliaryDeterminefun(){
+                console.log(this.subjectRow,369)
+                this.auxiliaryVisible = false
+            },
             // 下拉回调
             corpChange(value,name){
                 this.$set(this.form,'voucherType',value)