修改bug

src/views/exportTrade/salesContract/detailsPage.vue

@@ -146,7 +146,7 @@
                         <el-select size="small" v-model="form.banks" placeholder="请选择" @change="banksChange"
                                    clearable
                                    :disabled="detailData.status == 1 || !form.belongToCorpId">
-                            <el-option v-for="item in banksData" :key="item.id" :label="item.accountBank"
+                            <el-option v-for="item in banksData" :key="item.id" :label="item.accountBank+'-'+item.remarks"
                                        :value="item.accountNo">
                             </el-option>
                         </el-select>

src/views/iosBasicData/periodManagement/index.vue

@@ -71,6 +71,26 @@
                 <el-button v-if="title == '汇兑损益汇率' || '期间损益汇率'" size="mini" type="primary" @click="inPeriod">确 定</el-button>
             </span>
         </el-dialog>
+        <el-dialog v-dialogdrag append-to-body title="业务审核未通过明细" :visible.sync="openDialog2" width="50%"
+            :before-close="handleClose3">
+            <span style="display: flex;align-items: center;">
+                <avue-crud :data="dialogData" :option="dialogOption"></avue-crud>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="mini" @click="openDialog2 = false">取 消</el-button>
+                <el-button size="mini" type="primary" @click="exportBut()">导 出</el-button>
+            </span>
+        </el-dialog>
+        <el-dialog v-dialogdrag append-to-body title="凭证未记账数据" :visible.sync="openDialog3" width="50%"
+            :before-close="handleClose4">
+            <span style="display: flex;align-items: center;">
+                <avue-crud :data="dialogData2" :option="dialogOption2"></avue-crud>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="mini" @click="openDialog3 = false">取 消</el-button>
+                <el-button size="mini" type="primary" @click="exportBut2()">导 出</el-button>
+            </span>
+        </el-dialog>
     </div>
 </template>
   
@@ -86,6 +106,93 @@ export default {
     },
     data() {
         return {
+            dialogOption: {
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                addBtn: false,
+                index: false,
+                border: true,
+                menu: false,
+                header: false,
+                align: "center",
+                size: "small",
+                column: [
+                    {
+                        label: '业务模块',
+                        prop: 'businessType',
+                        overHidden: true,
+                    },
+                    {
+                        label: '单据号',
+                        prop: 'billNo',
+                        overHidden: true,
+                    },
+                    {
+                        label: '业务日期',
+                        prop: 'businessDate',
+                        overHidden: true,
+                    },
+                    {
+                        label: '提单号',
+                        prop: 'mblno',
+                        overHidden: true,
+                    },
+                    {
+                        label: '操作员',
+                        prop: 'operator',
+                        overHidden: true,
+                    },
+                    {
+                        label: '业务员',
+                        prop: 'salesperson',
+                        overHidden: true,
+                    }
+                ]
+            },
+            openDialog2: false,
+            dialogData: [],
+            dialogOption2: {
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                addBtn: false,
+                index: false,
+                border: true,
+                menu: false,
+                header: false,
+                align: "center",
+                size: "small",
+                column: [
+                    {
+                        label: '年',
+                        prop: 'year',
+                        overHidden: true,
+                    },
+                    {
+                        label: '月',
+                        prop: 'month',
+                        overHidden: true,
+                    },
+                    {
+                        label: '凭证号',
+                        prop: 'voucherNumber',
+                        overHidden: true,
+                    },
+                    {
+                        label: '凭证日期',
+                        prop: 'voucherDate',
+                        overHidden: true,
+                    },
+                    {
+                        label: '制单人',
+                        prop: 'operator',
+                        overHidden: true,
+                    }
+                ]
+            },
+            openDialog3: false,
+            dialogData2: [],
             itemForm: {},
             itemData: [],
             itemOption: {
@@ -119,7 +226,7 @@ export default {
                     }
                 ]
             },
-            itemForm2:{},
+            itemForm2: {},
             itemOption2: {
                 viewBtn: false,
                 editBtn: false,
@@ -342,8 +449,17 @@ export default {
                     type: 'warning'
                 }).then(() => {
                     locking({ id: row.id }).then(res => {
-                        this.$message.success("锁定成功");
-                        this.handleClick(this.activeName)
+                        if (res.data.msg == '审核未通过') {
+                            this.openDialog2 = true
+                            this.dialogData=res.data.data
+                        }else if(res.data.msg=='凭证未记账'){
+                            this.openDialog3 = true
+                            this.dialogData2=res.data.data
+                        } else {
+                            this.$message.success("锁定成功");
+                            this.handleClick(this.activeName)
+                        }
+
                     })
                 })
             } else {
@@ -409,6 +525,14 @@ export default {
             this.itemData2 = []
             this.itemOpenDialog = false
         },
+        handleClose3() {
+            this.dialogData = []
+            this.openDialog2 = false
+        },
+        handleClose4() {
+            this.dialogData2 = []
+            this.openDialog3 = false
+        },
         resetBill() {
             this.$confirm('确认账套初始化?', '提示', {
                 confirmButtonText: '确定',
@@ -460,17 +584,17 @@ export default {
         inPeriod() {
             let obj = {}
             obj = { ...this.itemForm, exchangeRateList: this.itemData }
-            
+
             generateVouchers(obj).then(res => {
                 console.log(res)
-                this.itemForm2=res.data.data
+                this.itemForm2 = res.data.data
                 this.handleClose()
                 this.itemOpenDialog = true
             })
 
         },
-        onPeriod(){
-            if(this.itemForm2.finVouchersItemsList.length==0){
+        onPeriod() {
+            if (this.itemForm2.finVouchersItemsList.length == 0) {
                 return this.$message.error("明细不能为空");
             }
             this.$confirm('确定保存凭证?', '提示', {
@@ -486,8 +610,8 @@ export default {
                     this.loading = false
                 })
             })
-            
-        },  
+
+        },
         //刷新
         refreshChange() {
             this.onLoad(this.page, this.search)