修改禅道1959的问题

src/views/approveDataH/index.vue

@@ -469,9 +469,8 @@ export default {
     //跳转页面
     jumpPage(row) {
       console.log('row',row);
-      console.log(eval("(" + row.pageStatus + ")"))
       if (row.url) {
-        if (eval("(" + row.pageStatus + ")")) {
+        if (row.pageStatus&&eval("(" + row.pageStatus + ")")) {
           this.$alert(
             "" +
             row.pageLabel +

src/views/iosBasicData/advanceCharge/detailsPage.vue

@@ -133,6 +133,16 @@ export default {
                         overHidden: true
                     },
                     {
+                        label: "收款金额",
+                        prop: "amountD",
+                        overHidden: true
+                    },
+                    {
+                        label: "付款金额",
+                        prop: "amountC",
+                        overHidden: true
+                    },
+                    {
                         label: "消费类型",
                         prop: "overpaymentType",
                         type: 'select',

src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -365,8 +365,14 @@ export default {
         }
         if (this.$route.query.billNo) {
             this.showLock = true
+            this.editDisabled = true
             this.getDetails(this.$route.query.billNo)
         }
+        if (this.$route.query.billId) {
+            this.showLock = true
+            this.editDisabled = true
+            this.getDetails(this.$route.query.billId)
+        }
         if (this.$route.query.params) {
             this.showLock = true
             this.getDetails(this.$route.query.params)
@@ -530,7 +536,7 @@ export default {
                 obj = {
                     id: this.form.id,
                     url: '/tradeAgency/exchangePurchasing/index',
-                    pageStatus: '',
+                    pageStatus: 'this.$store.getters.exchangePurStatus',
                     pageLabel: '付费申请(T)',
                 }
                 const loading = this.$loading({

src/views/tradeAgency/exchangePurchasing/index.vue

@@ -220,7 +220,7 @@ export default {
     },
     activated() {
         setTimeout(() => {
-            if (this.$route.query.billNo || this.$route.query.params) {
+            if (this.$route.query.billNo || this.$route.query.params||this.$route.query.billId) {
                 this.isShow = false
                 this.$store.commit("IN_EXPUR_DETAIL");
             }

src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -1544,8 +1544,18 @@ export default {
         }
         if (this.$route.query.billNo) {
             this.showLock = true
+            this.editButton = true
+            this.editDisabled = true
+            this.optionForm.disabled = true
             this.getDetaiByMblno(this.$route.query.billNo)
         }
+        if (this.$route.query.billId) {
+            this.showLock = true
+            this.editButton = true
+            this.editDisabled = true
+            this.optionForm.disabled = true
+            this.getDetails(this.$route.query.billId)
+        }
         if (this.$route.query.id) {
             this.showLock = true
             this.editButton = true
@@ -2141,8 +2151,8 @@ export default {
                 }
             }
             if (name == '入库派车') {
-                if (!row.fleetName || !row.licenseNumber || !row.fullName || !row.contactInformation || !row.deliveryDate || !row.deliveryAddressName) {
-                    return this.$message.error((!row.fleetName ? "承运车队，" : '') + (!row.licenseNumber ? "车号，" : '') + (!row.fullName ? "姓名，" : '') + (!row.contactInformation ? "联系方式，" : '') + (!row.deliveryDate ? "送货时间，" : null) + (!row.deliveryAddressName ? "送货地点" : null) + "不能为空");
+                if (!row.fleetName || !row.licenseNumber || !row.fullName || !row.contactInformation) {
+                    return this.$message.error((!row.fleetName ? "承运车队，" : '') + (!row.licenseNumber ? "车号，" : '') + (!row.fullName ? "姓名，" : '') + (!row.contactInformation ? "联系方式" : '') + "不能为空");
                 }
                 if (row.whetherDispatchVehicles == 1) {
                     const loading = this.$loading({
@@ -2177,8 +2187,8 @@ export default {
 
             }
             if (name == '生成入库') {
-                if (!row.fleetName || !row.licenseNumber || !row.fullName || !row.contactInformation || !row.deliveryDate || !row.deliveryAddressName) {
-                    return this.$message.error((!row.fleetName ? "承运车队，" : '') + (!row.licenseNumber ? "车号，" : '') + (!row.fullName ? "姓名，" : '') + (!row.contactInformation ? "联系方式，" : '') + (!row.deliveryDate ? "送货时间，" : null) + (!row.deliveryAddressName ? "送货地点" : null) + "不能为空");
+                if (!row.fleetName || !row.licenseNumber || !row.fullName || !row.contactInformation) {
+                    return this.$message.error((!row.fleetName ? "承运车队，" : '') + (!row.licenseNumber ? "车号，" : '') + (!row.fullName ? "姓名，" : '') + (!row.contactInformation ? "联系方式" : '') + "不能为空");
                 }
                 if (row.whetherWarehouseEntry == 1) {
                     const loading = this.$loading({

src/views/tradeAgency/oceanFreightImport/index.vue

@@ -14,6 +14,10 @@
                     </el-checkbox-group>
                     <!-- <avue-form v-model="query.checkbox" :option="checkboxOption"></avue-form> -->
                 </template>
+                <tempalte slot="operatorNameSearch">
+                    <dic-select v-model="query.operatorName" placeholder="操作员" key="id" label="realName"
+                    res="records" url="/blade-user/page" :filterable="true" :remote="true" dataName="realName"></dic-select>
+                </tempalte>
                 <template slot="status" slot-scope="{ row }">
                     <div>
                         <span v-if="row.status == item.dictKey" v-for="(item, index) in auditStatusList" :key="index"
@@ -53,6 +57,7 @@
 import { getList, remove, retreatPledge } from "@/api/tradeAgency/oceanFreightImport";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
+import dicSelect from "@/components/dicSelect/main";
 import { getWorkDicts } from "@/api/system/dictbiz";
 export default {
     data() {
@@ -203,6 +208,13 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: '操作员',
+                        prop: 'operatorName',
+                        search: true,
+                        searchOrder: 11,
+                        overHidden: true
+                    },
+                    {
                         label: "发货人",
                         prop: "hshipperCnName",
                         width: "80",
@@ -398,7 +410,7 @@ export default {
                         prop: "checkbox",
                         overHidden: true,
                         search: true,
-                        searchSpan: 18,
+                        searchSpan: 12,
                         searchOrder: 14,
                         hide: true,
                         showColumn: false,
@@ -410,6 +422,7 @@ export default {
     },
     components: {
         detailsPage,
+        dicSelect
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(387), this.optionBack);
@@ -424,6 +437,10 @@ export default {
                 this.isShow = false
                 this.$store.commit("IN_OCEANFS_DETAIL");
             }
+            if (this.$route.query.billId) {
+                this.isShow = false
+                this.$store.commit("IN_OCEANFS_DETAIL");
+            }
             if (this.$route.query.id) {
                 this.isShow = false
                 this.$store.commit("IN_OCEANFS_DETAIL");

src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -396,6 +396,23 @@
                 <el-button size="mini" type="primary" @click="wkSubmit">提 交</el-button>
             </span>
         </el-dialog>
+        <el-dialog append-to-body title="生成货代" class="el-dialogDeep" :visible.sync="hdDialog" width="30%" top="30vh"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" @closed="hdClosed"
+            v-dialog-drag>
+            <avue-form v-model="hdForm" :option="hdOption">
+                <tempalte slot="operatorName">
+                    <div style="display: flex;">
+                        <dic-select v-model="hdForm.operatorName" placeholder="操作员" key="id" label="realName"
+                            res="records" url="/blade-user/page" :filterable="true" :remote="true" dataName="realName"
+                            @selectChange="dicChange('operatorName', $event)"></dic-select>
+                    </div>
+                </tempalte>
+            </avue-form>
+            <span slot="footer" class="dialog-footer">
+                <el-button size="mini" @click="hdDialog = false">取 消</el-button>
+                <el-button size="mini" type="primary" @click="hdSubmit">提 交</el-button>
+            </span>
+        </el-dialog>
         <dictbiz-dialog ref="dictbiz" :title="dicTitle" :code="dicCode" :parentId="parentId" @closed="getAllWorkDicts">
         </dictbiz-dialog>
     </div>
@@ -420,6 +437,8 @@ export default {
 
     data() {
         return {
+            hdDialog: false,
+            hdForm: {},
             dicTitle: null,
             parentId: null,
             dicCode: null,
@@ -427,6 +446,18 @@ export default {
             wkForm: {
                 agentItemsRList: []
             },
+            hdOption: {
+                menuBtn: false,
+                span: 24,
+                disabled: false,
+                column: [
+                    {
+                        label: '操作员',
+                        prop: 'operatorName',
+                        disabled: false,
+                    },
+                ]
+            },
             wkOption: {
                 menuBtn: false,
                 span: 8,
@@ -1455,6 +1486,13 @@ export default {
                     this.form.transactionMethodId = null
                 }
             }
+            if (name == 'operatorName') {
+                if (row) {
+                    this.hdForm.operatorId = row.id
+                } else {
+                    this.hdForm.operatorId = null
+                }
+            }
         },
         rowDicChange(name, row, el) {
             if (name == 'hsCode') {
@@ -1938,21 +1976,7 @@ export default {
                 });
             }
             if (name == '生成货代') {
-                let obj = {
-                    ...this.form,
-                    agentItemsList: this.selectionList
-                }
-                const loading = this.$loading({
-                    lock: true,
-                    text: '加载中',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(255,255,255,0.7)'
-                });
-                generateFreightForwarder(obj).then(res => {
-                    this.$message.success("生成货代成功");
-                }).finally(() => {
-                    loading.close();
-                })
+                this.hdDialog = true
             }
             if (name == '生成申请付款') {
                 const loading = this.$loading({
@@ -2024,6 +2048,26 @@ export default {
                 }
             });
         },
+        hdSubmit() {
+            let obj = {
+                ...this.form,
+                ...this.hdForm,
+                agentItemsList: this.selectionList,
+            }
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            generateFreightForwarder(obj).then(res => {
+                this.$message.success("生成货代成功");
+                this.hdDialog = false
+                this.getDetails(this.form.id)
+            }).finally(() => {
+                loading.close();
+            })
+        },
         wkSubmit() {
             if (this.wkType == '尾款账单') {
                 generateBalancePaymentBill(this.wkForm).then(res => {
@@ -2049,6 +2093,9 @@ export default {
             this.wkForm = this.$options.data().wkForm
             this.wkType = null
         },
+        hdClosed() {
+            this.hdForm = this.$options.data().hdForm
+        },
         application() {
             // if (this.form.downPayment != 1) return this.$message.error("未申请首款账单");
             // if (this.form.balancePayment != 1) return this.$message.error("未申请尾款账单");

src/views/tradeAgency/tradeAgency/index.vue

@@ -13,6 +13,10 @@
                         }}</el-checkbox>
                     </el-checkbox-group>
                 </template>
+                <tempalte slot="operatorNameSearch">
+                    <dic-select v-model="query.operatorName" placeholder="操作员" key="id" label="realName"
+                    res="records" url="/blade-user/page" :filterable="true" :remote="true" dataName="realName"></dic-select>
+                </tempalte>
                 <template slot="menuLeft">
                     <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
                     </el-button>
@@ -80,6 +84,7 @@ import { getList, remove, copyAgent, applyForPaymentList, generate } from "@/api
 import { getWorkDicts } from "@/api/system/dictbiz";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
+import dicSelect from "@/components/dicSelect/main";
 import _ from "lodash";
 export default {
     data() {
@@ -309,6 +314,13 @@ export default {
                         showColumn: false,
                     },
                     {
+                        label: '操作员',
+                        prop: 'operatorName',
+                        search: true,
+                        searchOrder: 16,
+                        overHidden: true
+                    },
+                    {
                         label: "合同日期",
                         prop: "contractDate",
                         width: "120",
@@ -572,6 +584,7 @@ export default {
     },
     components: {
         detailsPage,
+        dicSelect
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(375), this.optionBack);