Browse Source

修改bug

Qukatie 10 months ago
parent
commit
29b0932bde

+ 9 - 1
src/api/iosBasicData/storageFee.js

@@ -42,4 +42,12 @@ export const remove = (data) => {
       method: 'post',
       params: data
   })
-}
+}
+//明细删除
+export const itemRemove = (data) => {
+    return request({
+        url: '/api/blade-los/storagefeeitems/remove',
+        method: 'post',
+        params: data
+    })
+  }

+ 2 - 2
src/components/tradeAgency/fee-info.vue

@@ -33,7 +33,7 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
                     dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
@@ -115,7 +115,7 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
                     dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>

+ 5 - 5
src/components/tradeAgency/fee-infosimple.vue

@@ -19,7 +19,7 @@
             </template>
             <template slot="corpCnName" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
                     dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
@@ -93,7 +93,7 @@
                     @click="allClick('确认尾款', 'C')">确认尾款</el-button> -->
             </template>
             <template slot="indexHeader" slot-scope="{row,index}">
-                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled" circle @click="addRow('C')">
+                <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="disabled|| form.firstStatus == '审核通过'" circle @click="addRow('C')">
                 </el-button>
             </template>
             <template slot="index" slot-scope="{row,index}">
@@ -101,7 +101,7 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit && !row.feeType" v-model="row.corpCnName" placeholder="往来单位" key="id"
-                    label="cnName" res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true"
+                    label="cnName" res="records" url="/blade-los/bcorps/listByType" :filterable="true"
                     :remote="true" dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
@@ -144,7 +144,7 @@
                 <span v-else>{{ row.exrate }}</span>
             </tempalte>
             <tempalte slot="stlExrateForm" slot-scope="{ row }">
-                <el-input-number v-if="row.$cellEdit && !row.feeType" v-model="row.stlExrate"
+                <el-input-number v-if="row.$cellEdit" v-model="row.stlExrate"
                     @change="countChange(row, 'C')" :controls="false" placeholder="请输入 结算汇率" size="small"
                     style="width: 100%;"></el-input-number>
                 <span v-else>{{ row.stlExrate }}</span>
@@ -504,7 +504,7 @@ export default {
                         label: "结算日期",
                         prop: "stlDate",
                         width: "120",
-                        cell: true,
+                        // cell: true,
                         type: "date",
                         format: "yyyy-MM-dd",
                         valueFormat: "yyyy-MM-dd 00:00:00",

+ 2 - 2
src/components/tradeAgency/fee-oceanFreight.vue

@@ -33,7 +33,7 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
                     dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>
@@ -116,7 +116,7 @@
             </template>
             <template slot="corpCnNameForm" slot-scope="{ row }">
                 <dic-select v-if="row.$cellEdit" v-model="row.corpCnName" placeholder="往来单位" key="id" label="cnName"
-                    res="records" url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
+                    res="records" url="/blade-los/bcorps/listByType" :filterable="true" :remote="true"
                     dataName="cnName" @selectChange="rowDicChange('corpCnName', $event, row)"></dic-select>
                 <span v-else>{{ row.corpCnName }}</span>
             </template>

+ 4 - 0
src/enums/column-name.js

@@ -1859,6 +1859,10 @@ const columnName = [{
     code: 408,
     name: '贸易代理-统计分析(L)-客户分析'
   },
+  {
+    code: 409,
+    name: '贸易代理-仓库管理-仓库明细'
+  },
 ]
 export const getColumnName = (key) => {
   for (let index = 0; index < columnName.length; index++) {

+ 7 - 2
src/views/iosBasicData/losbfeestemplate/feesTemplateItems.vue

@@ -254,7 +254,7 @@ export default {
 
             // 获取到的数据
             form: {
-                isShared: 0,
+                isShared:'1',
                 status: 0,
                 feesTemplateItemsList: []
             },
@@ -696,7 +696,12 @@ export default {
 
         // 费用详细添加
         feestemplatepingCompanyAdd() {
-            this.feestemplateForm = {}
+            this.feestemplateForm = {
+                quantity:1,
+                price:1,
+                curCode:'CNY',
+                unitNo:'KGS'
+            }
             this.feestemplateVisible = true
         },
         // 费用详细编辑

+ 59 - 28
src/views/iosBasicData/storageFee/detailsPage.vue

@@ -25,13 +25,9 @@
                             url="/blade-los/storage/list" :filterable="true" :remote="true" dataName="cname"
                             @selectChange="dicChange('warehouseName', $event)"></dic-select>
                     </tempalte>
-                    <tempalte slot="goodsType" slot-scope="{ row }">
-                        <dic-select v-model="form.goodsType" placeholder="商品类型" key="dictKey" label="dictValue"
-                            url="/blade-system/dict-biz/dictionary?code=goods-type" :filterable="true"></dic-select>
-                    </tempalte>
                 </avue-form>
             </trade-card>
-            <trade-card title="仓储明细">
+            <trade-card title="仓储费">
                 <avue-crud :option="option" :data="form.storageFeeItemsList" id="out-table" ref="crud"
                     @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 396)"
                     @saveColumn="saveColumn('crud', 'option', 'optionBack', 396)">
@@ -39,11 +35,22 @@
                         <el-button type="primary" size="small" icon="el-icon-plus" @click="addRow">新 增
                         </el-button>
                     </template>
-                    <template slot="feeName" slot-scope="{ row }">
+                    <tempalte slot="goodsType" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit" v-model="row.goodsType" placeholder="商品类型" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=goods-type"
+                            :filterable="true"></dic-select>
+                        <span v-else>{{ row.goodsType }}</span>
+                    </tempalte>
+                    <!-- <template slot="feeName" slot-scope="{ row }">
                         <dic-select v-if="row.$cellEdit" v-model="row.feeName" placeholder="费用信息" key="id" res="records"
                             label="cnName" url="/blade-los/bfees/list" :filterable="true" :remote="true" fff
                             dataName="cnName" @selectChange="rowDicChange('feeName', $event, row)"></dic-select>
                         <span v-else>{{ row.feeName }}</span>
+                    </template> -->
+                    <template slot="menu" slot-scope="{ row, index }">
+                        <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">{{ row.$cellEdit ?
+                            '保存' : '编辑' }}</el-button>
+                        <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)">删除</el-button>
                     </template>
                 </avue-crud>
             </trade-card>
@@ -55,7 +62,7 @@
 </template>
 
 <script>
-import { submit, getDetail, copyAgent } from "@/api/iosBasicData/storageFee";
+import { submit, getDetail, copyAgent, itemRemove } from "@/api/iosBasicData/storageFee";
 import dicSelect from "@/components/dicSelect/main";
 import { bfeesList } from "@/api/iosBasicData/bfees";
 import _ from "lodash";
@@ -87,10 +94,6 @@ export default {
                         prop: "warehouseName",
                     },
                     {
-                        label: "商品类别",
-                        prop: "goodsType",
-                    },
-                    {
                         label: "有效期起",
                         prop: "beginDate",
                         type: "date",
@@ -136,11 +139,14 @@ export default {
                 viewBtn: false,
                 editBtn: false,
                 delBtn: false,
-                menu: false,
                 refreshBtn: false,
                 align: 'center',
                 column: [
                     {
+                        label: "商品类别",
+                        prop: "goodsType",
+                    },
+                    {
                         label: "费用名称",
                         prop: "feeName",
                         overHidden: true
@@ -160,22 +166,22 @@ export default {
                         },
                         overHidden: true
                     },
-                    {
-                        label: "开始天数",
-                        prop: "fromDays",
-                        cell: true,
-                        type: 'number',
-                        controls: false,
-                        overHidden: true
-                    },
-                    {
-                        label: "结束天数",
-                        prop: "enDays",
-                        cell: true,
-                        type: 'number',
-                        controls: false,
-                        overHidden: true
-                    },
+                    // {
+                    //     label: "开始天数",
+                    //     prop: "fromDays",
+                    //     cell: true,
+                    //     type: 'number',
+                    //     controls: false,
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "结束天数",
+                    //     prop: "enDays",
+                    //     cell: true,
+                    //     type: 'number',
+                    //     controls: false,
+                    //     overHidden: true
+                    // },
                     {
                         label: "单价",
                         prop: "price",
@@ -210,6 +216,31 @@ export default {
         }
     },
     methods: {
+        rowEdit(row, index) {
+            if (row.$cellEdit) {
+                this.$set(row, '$cellEdit', false)
+            } else {
+                this.$set(row, '$cellEdit', true)
+            }
+        },
+        rowDel(row, index) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                if (row.id) {
+                    itemRemove({ ids: row.id }).then(res => {
+                        this.form.storageFeeItemsList.splice(index, 1);
+                        this.$message.success("操作成功!");
+                    });
+                } else {
+                    this.form.storageFeeItemsList.splice(index, 1);
+                    this.$message.success("操作成功!");
+                }
+            }
+            );
+        },
         dicChange(name, row) {
             if (name == 'corpName') {
                 if (row) {

+ 395 - 0
src/views/iosBasicData/warehouse/detailsPage.vue

@@ -0,0 +1,395 @@
+<template>
+    <div>
+        <div class="customer-head">
+            <div class="customer-back">
+                <el-button type="danger" style="border: none;background: none;color: red" icon="el-icon-arrow-left"
+                    @click="goBack(0)">返回列表
+                </el-button>
+            </div>
+            <div class="add-customer-btn">
+                <el-button class="el-button--small-yh" style="margin-left: 6px;" type="primary" size="small"
+                    @click="submit">保 存
+                </el-button>
+            </div>
+        </div>
+        <div style="margin-top: 50px">
+            <trade-card title="基础信息">
+                <avue-form :option="optionForm" v-model="form" ref="form">
+                </avue-form>
+            </trade-card>
+            <trade-card title="仓储明细">
+                <avue-crud :option="option" :data="form.storageFeeItemsList" id="out-table" ref="crud"
+                    @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 409)"
+                    @saveColumn="saveColumn('crud', 'option', 'optionBack', 409)">
+                    <template slot="menuLeft">
+                        <el-button type="primary" size="small" icon="el-icon-plus" @click="addRow">新 增
+                        </el-button>
+                    </template>
+                    <tempalte slot="goodsTypeForm" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit" v-model="row.goodsType" placeholder="商品类型" key="dictKey"
+                            label="dictValue" url="/blade-system/dict-biz/dictionary?code=goods-type"
+                            :filterable="true"></dic-select>
+                        <span v-else>{{ row.goodsType }}</span>
+                    </tempalte>
+                    <!-- <template slot="feeName" slot-scope="{ row }">
+                        <dic-select v-if="row.$cellEdit" v-model="row.feeName" placeholder="费用信息" key="id" res="records"
+                            label="cnName" url="/blade-los/bfees/list" :filterable="true" :remote="true" fff
+                            dataName="cnName" @selectChange="rowDicChange('feeName', $event, row)"></dic-select>
+                        <span v-else>{{ row.feeName }}</span>
+                    </template> -->
+                    <template slot="menu" slot-scope="{ row, index }">
+                        <el-button size="small" icon="el-icon-edit" type="text" @click="rowEdit(row)">{{ row.$cellEdit ?
+                            '保存' : '编辑' }}</el-button>
+                        <el-button size="small" icon="el-icon-delete" type="text" @click="rowDel(row, index)">删除</el-button>
+                    </template>
+                </avue-crud>
+            </trade-card>
+            <!-- <containerTitle title="上传附件"></containerTitle>
+            <c-upload :data="form.filesCenterList" :enumerationValue="76"
+                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload> -->
+        </div>
+    </div>
+</template>
+
+<script>
+import { submit, getDetail, copyAgent, itemRemove } from "@/api/iosBasicData/storageFee";
+import { getBtrademodesList, getBtrademodesDetail, addBtrademodes, updateBtrademodes, removeBtrademodes } from "@/api/iosBasicData/warehouse";
+import dicSelect from "@/components/dicSelect/main";
+import { bfeesList } from "@/api/iosBasicData/bfees";
+import _ from "lodash";
+export default {
+    name: "detailsPage",
+
+    data() {
+        return {
+            form: {
+                status: '0',
+                storageFeeItemsList: []
+            },
+            optionForm: {
+                menuBtn: false,
+                span: 8,
+                column: [
+                    {
+                        label: "编码",
+                        prop: "code",
+                        disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "中文名称",
+                        prop: "cname",
+                        disabled: false,
+                        rules: [{
+                            required: true,
+                            message: " ",
+                            trigger: "blur"
+                        }]
+                    },
+                    {
+                        label: "状态",
+                        prop: "status",
+                        type: "select",
+                        search: true,
+                        dicData: [{
+                            label: '启用',
+                            value: '0'
+                        }, {
+                            label: '停用',
+                            value: '1'
+                        }],
+                        value: '0',
+                        overHidden: true,
+                    },
+                    {
+                        label: '备注',
+                        prop: "remarks",
+                        type: 'textarea',
+                        disabled: false,
+                        minRows: 2,
+                    },
+                ]
+            },
+            option: {},
+            optionBack: {
+                height: 'auto',
+                calcHeight: 30,
+                menuWidth: 140,
+                border: true,
+                index: true,
+                addBtn: false,
+                viewBtn: false,
+                editBtn: false,
+                delBtn: false,
+                refreshBtn: false,
+                align: 'center',
+                column: [
+                    {
+                        label: "费用名称",
+                        prop: "feeName",
+                        overHidden: true
+                    },
+                    {
+                        label: "计价单位",
+                        prop: "feeUnit",
+                        // cell: true,
+                        type: 'select',
+                        filterable: true,
+                        remote: true,
+                        dicUrl: "/api/blade-los/bunits/list",
+                        props: {
+                            label: 'cnName',
+                            value: 'cnName',
+                            res: 'data.records'
+                        },
+                        overHidden: true
+                    },
+                    {
+                        label: "商品类别",
+                        prop: "goodsType",
+                        cell: true,
+                        slot: true,
+                        formslot: true,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请选择商品类别',
+                                trigger: 'blur'
+                            }
+                        ]
+                    },
+                    // {
+                    //     label: "开始天数",
+                    //     prop: "fromDays",
+                    //     cell: true,
+                    //     type: 'number',
+                    //     controls: false,
+                    //     overHidden: true
+                    // },
+                    // {
+                    //     label: "结束天数",
+                    //     prop: "enDays",
+                    //     cell: true,
+                    //     type: 'number',
+                    //     controls: false,
+                    //     overHidden: true
+                    // },
+                    {
+                        label: "应收单价",
+                        prop: "price",
+                        cell: true,
+                        type: 'number',
+                        controls: false,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入应收单价',
+                                trigger: 'blur'
+                            }
+                        ]
+                    },
+                    {
+                        label: "应付单价",
+                        prop: "priceC",
+                        cell: true,
+                        type: 'number',
+                        controls: false,
+                        overHidden: true,
+                        rules: [
+                            {
+                                required: true,
+                                message: '请输入应付单价',
+                                trigger: 'blur'
+                            }
+                        ]
+                    },
+                    {
+                        label: "备注",
+                        prop: "remarks",
+                        cell: true,
+                        overHidden: true
+                    }
+                ]
+            },
+        }
+    },
+    components: {
+        dicSelect,
+    },
+    props: {
+        detailData: Object
+    },
+    async created() {
+        this.option = await this.getColumnData(this.getColumnName(409), this.optionBack);
+        if (this.detailData.id) {
+            this.getDetails(this.detailData.id)
+        }
+    },
+    methods: {
+        rowEdit(row, index) {
+            if (row.$cellEdit) {
+                if (!row.goodsType || !row.price|| !row.priceC) {
+                    this.$refs.crud.rowCell(row, row.$index)
+                    return this.$message.error("请完善明细信息");
+                }
+                this.$set(row, '$cellEdit', false)
+            } else {
+                this.$set(row, '$cellEdit', true)
+            }
+        },
+        rowDel(row, index) {
+            this.$confirm("确定将选择数据删除?", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning"
+            }).then(() => {
+                if (row.id) {
+                    itemRemove({ ids: row.id }).then(res => {
+                        this.form.storageFeeItemsList.splice(index, 1);
+                        this.$message.success("操作成功!");
+                    });
+                } else {
+                    this.form.storageFeeItemsList.splice(index, 1);
+                    this.$message.success("操作成功!");
+                }
+            }
+            );
+        },
+        rowDicChange(name, row, el) {
+            if (name == 'feeName') {
+                if (row) {
+                    el.feeId = row.id
+                } else {
+                    el.feeId = null
+                }
+            }
+        },
+        getDetails(id) {
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            getBtrademodesDetail(id).then(res => {
+                this.form = res.data.data
+                console.log(this.form)
+                this.$refs.crud.dicInit();
+            }).finally(() => {
+                loading.close()
+            })
+        },
+        getCopydate(id) {
+            const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+            });
+            copyAgent({ id: id }).then(res => {
+                this.form = res.data.data
+            }).finally(() => {
+                loading.close()
+            })
+        },
+        addRow() {
+            this.$refs.crud.dicInit();
+            bfeesList(1, 10, { cnName: '仓储费' }).then(res => {
+                res.data.data.records.forEach(e => {
+                    if (e.cnName == '仓储费')
+                        this.form.storageFeeItemsList.push({
+                            feeId: e.id,
+                            feeName: e.cnName,
+                            feeUnit: '吨',
+                            $cellEdit: true
+                        })
+                })
+
+            })
+
+        },
+        submit() {
+            this.$refs["form"].validate((valid, done) => {
+                done();
+                if (valid) {
+                    for (let row of this.form.storageFeeItemsList) {
+                        if (!row.goodsType || !row.price|| !row.priceC) {
+                            this.$refs.crud.rowCell(row, row.$index)
+                            return this.$message.error("请完善明细信息");
+                        }
+                    }
+                    const loading = this.$loading({
+                        lock: true,
+                        text: '加载中',
+                        spinner: 'el-icon-loading',
+                        background: 'rgba(255,255,255,0.7)'
+                    });
+                    updateBtrademodes(this.form).then(res => {
+                        this.$message.success("保存成功");
+                        this.getDetails(res.data.data.id)
+                    }).finally(() => {
+                        loading.close();
+                    })
+                } else {
+                    return false;
+                }
+            });
+        },
+        //自定义列保存
+        async saveColumn(ref, option, optionBack, code) {
+            const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+            if (inSave) {
+                this.$message.success("保存成功");
+                //关闭窗口
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        //自定义列重置
+        async resetColumn(ref, option, optionBack, code) {
+            this[option] = this[optionBack];
+            const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+            if (inSave) {
+                this.$message.success("重置成功");
+                this.$refs[ref].$refs.dialogColumn.columnBox = false;
+            }
+        },
+        goBack(type) {
+            this.$emit("goBack", type);
+            this.$emit('updateKey')
+        },
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .el-form-item {
+    margin-bottom: 8px !important;
+}
+
+::v-deep .el-table .cell {
+    padding: 0 2px !important;
+
+    .el-form-item {
+        margin-bottom: 0px !important;
+    }
+
+}
+
+::v-deep .avue-crud .el-table .el-form-item__label {
+    left: -1px;
+}
+
+::v-deep#out-table .back-one {
+    background: #ecf5ff !important;
+}
+
+::v-deep#out-table .back-two {
+    background: #ecf5ff !important;
+}
+</style>

+ 450 - 428
src/views/iosBasicData/warehouse/index.vue

@@ -1,6 +1,7 @@
 <!-- 贸易条款 -->
 <template>
-    <basic-container>
+  <div>
+    <basic-container v-if="isShow">
       <avue-crud :option="option" :table-loading="loading" :data="data" :page.sync="page" :permission="permissionList"
         id="out-table" :header-cell-class-name="headerClassName" :before-open="beforeOpen" :search.sync="search"
         v-model="form" ref="crud" @row-update="rowUpdate" @row-save="rowSave" @row-del="rowDel"
@@ -20,21 +21,24 @@
         <template slot-scope="scope" slot="menu">
           <!--<el-button type="text" icon="el-icon-view" size="small" @click.stop="rowViewfun(scope.row, scope.index)">查看-->
           <!--</el-button>-->
-          <el-button type="text" icon="el-icon-edit" size="small" @click.stop="rowEditfun(scope.row, scope.index)">编辑
-          </el-button>
+          <!-- <el-button type="text" icon="el-icon-edit" size="small" @click.stop="rowEditfun(scope.row, scope.index)">编辑
+          </el-button> -->
           <el-button type="text" icon="el-icon-edit" size="small" @click.stop="rowDel(scope.row, scope.index)">删除
           </el-button>
-            <el-button v-if="scope.row.status == 1" type="text" icon="el-icon-turn-off" style="color: #85e967" size="small"
-                       @click.stop="statusfun(scope.row.id,0)">
-                启用
-            </el-button>
-            <el-button v-if="scope.row.status == 0" type="text" icon="el-icon-turn-off" style="color: #e83c3a" size="small"
-                       @click.stop="statusfun(scope.row.id,1)">
-                停用
-            </el-button>
+          <el-button v-if="scope.row.status == 1" type="text" icon="el-icon-turn-off" style="color: #85e967" size="small"
+            @click.stop="statusfun(scope.row.id, 0)">
+            启用
+          </el-button>
+          <el-button v-if="scope.row.status == 0" type="text" icon="el-icon-turn-off" style="color: #e83c3a" size="small"
+            @click.stop="statusfun(scope.row.id, 1)">
+            停用
+          </el-button>
+        </template>
+        <template slot="cname" slot-scope="{ row }">
+          <span style="color: #1e9fff;cursor: pointer" @click="inEdit(row)">{{ row.cname }}</span>
         </template>
       </avue-crud>
-  
+
       <!-- <el-dialog title="导入贸易条款" append-to-body :visible.sync="excelBox" width="555px" :close-on-click-modal="false"
         v-dialog-drag>
         <avue-form :option="excelOption" v-model="excelForm" :table-loading="excelLoading" :upload-before="uploadBefore"
@@ -49,346 +53,325 @@
           温馨提示 第一次导入时请先下载模板
         </p>
       </el-dialog> -->
-  
+
     </basic-container>
-  </template>
-  
-  <script>
-  import { getBtrademodesList, getBtrademodesDetail, addBtrademodes, updateBtrademodes, removeBtrademodes } from "@/api/iosBasicData/warehouse";
-  import { mapGetters } from "vuex";
-  
-  import { getToken } from "@/util/auth";
+    <detailsPage v-if="!isShow" :detailData="detailData" @goBack="goBack"></detailsPage>
+  </div>
+</template>
   
-  export default {
-    data() {
-      return {
-        form: {},
-        query: {},
-        loading: true,
-        excelBox: false,
-        search: {},
-        excelForm: {},
-        excelLoading: false,
-        excelOption: {
-          submitBtn: false,
-          emptyBtn: false,
-          column: [
-            {
-              label: "模板下载",
-              prop: "excelTemplate",
-              formslot: true,
-              span: 24
-            },
-            {
-              label: "模板上传",
-              prop: "excelFile",
-              type: "upload",
-              drag: true,
-              loadText: "模板上传中,请稍等",
-              span: 24,
-              propsHttp: {
-                res: "data"
-              },
-              tip: "请上传 .xls,.xlsx 标准格式文件",
-              action: "/api/blade-los/btrademodes/importBTradeModes"
-            }
-          ]
-        },
-        page: {
-          pageSize: 10,
-          currentPage: 1,
-          total: 0,
-          pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
-        },
-        selectionList: [],
-        option: {
-          dialogDrag: true,
-        },
-        optionBack: {
-          dialogDrag: true,
-          height: 'auto',
-          stripe: true,
-          calcHeight: 30,
-          searchIcon: true,
-          searchIndex: 4,
-          tip: false,
-          searchShow: true,
-          searchMenuSpan: 24,
-          border: true,
-          index: true,
-          viewBtn: false,
-          selection: true,
-          dialogClickModal: false,
-            menuWidth:260,
-          column: [
-            {
-              label: "编码",
-              prop: "code",
-              width: "180",
-              search: true,
-              slot: true,
-              rules: [{
-                required: true,
-                message: "请输入编码",
-                trigger: "blur"
-              }],
-                overHidden:true,
-            },
-            {
-              label: "中文名称",
-              prop: "cname",
-              width: "180",
-              search: true,
-              slot: true,
-              rules: [{
-                required: true,
-                message: "请输入中文名称",
-                trigger: "blur"
-              }],
-                overHidden:true,
-            },
-            {
-              label: "状态",
-              prop: "status",
-              type: "select",
-              search: true,
-              dicData: [{
-                label: '启用',
-                value: 0
-              }, {
-                label: '停用',
-                value: 1
-              }],
-              value: 0,
-                overHidden:true,
-            },
-              {
-                label: "创建人",
-                prop: "createUserName",
-                  display: false,
-                  overHidden:true,
-              },
-              {
-                label: "创建部门",
-                prop: "createDeptName",
-                  display: false,
-                  overHidden:true,
-              },
-              {
-                label: "创建时间",
-                prop: "createTime",
-                  width: "160",
-                  display: false,
-                  overHidden:true,
-              },
-              {
-                label: "修改人",
-                prop: "updateUserName",
-                  display: false,
-                  overHidden:true,
-              },
-              {
-                label: "修改时间",
-                prop: "updateTime",
-                  width: "160",
-                  display: false,
-                  overHidden:true,
-              },
-            {
-              label: "是否已删除(0 否 1是)",
-              prop: "isDeleted",
-                hide: true,
-                display: false,
-                overHidden:true,
+<script>
+import { getBtrademodesList, getBtrademodesDetail, addBtrademodes, updateBtrademodes, removeBtrademodes } from "@/api/iosBasicData/warehouse";
+import { mapGetters } from "vuex";
+import detailsPage from "./detailsPage";
+import { getToken } from "@/util/auth";
+
+export default {
+  data() {
+    return {
+      detailData: {},
+      isShow: true,
+      form: {},
+      query: {},
+      loading: true,
+      excelBox: false,
+      search: {},
+      excelForm: {},
+      excelLoading: false,
+      excelOption: {
+        submitBtn: false,
+        emptyBtn: false,
+        column: [
+          {
+            label: "模板下载",
+            prop: "excelTemplate",
+            formslot: true,
+            span: 24
+          },
+          {
+            label: "模板上传",
+            prop: "excelFile",
+            type: "upload",
+            drag: true,
+            loadText: "模板上传中,请稍等",
+            span: 24,
+            propsHttp: {
+              res: "data"
             },
-            {
-              label: "备注",
-              prop: "remarks",
-              type: 'textarea',
-              width: "180",
-              span: 24,
-              minRows: 3,
-              slot: true,
-                overHidden:true,
-            },
-          ]
-        },
-        data: []
-      };
-    },
-    async created() {
-      this.option = await this.getColumnData(this.getColumnName(394), this.optionBack);
-    },
-    computed: {
-      ...mapGetters(["permission"]),
-      permissionList() {
-        return {
-          addBtn: this.vaildData(this.permission.btrademodes_add, false),
-          viewBtn: this.vaildData(this.permission.btrademodes_view, false),
-          delBtn: this.vaildData(this.permission.btrademodes_delete, false),
-          editBtn: this.vaildData(this.permission.btrademodes_edit, false)
-        };
-      },
-      ids() {
-        let ids = [];
-        this.selectionList.forEach(ele => {
-          ids.push(ele.id);
-        });
-        return ids.join(",");
-      }
-    },
-    methods: {
-        // 禁用启用按钮
-        statusfun(id,status){
-            this.$confirm("确定将选择数据更改状态?", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning"
-            }).then(()=>{
-                getBtrademodesDetail(id).then(res=>{
-                    let obj = res.data.data;
-                    obj.status = status
-                    updateBtrademodes(obj).then(()=>{
-                        this.onLoad(this.page);
-                        this.$message({
-                            type: "success",
-                            message: "操作成功!"
-                        });
-                    })
-                })
-            })
-        },
-      // 导出
-      handleExport() {
-        var condition = ''
-        for (const key in this.search) {
-          var value = this.search[key]
-          if (value) {
-            condition += `&${key}=${this.search[key]}`
+            tip: "请上传 .xls,.xlsx 标准格式文件",
+            action: "/api/blade-los/btrademodes/importBTradeModes"
           }
-        }
-  
-        this.$confirm('是否导出贸易条款?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(() => {
-          window.open(
-            `/api/blade-los/btrademodes/exportBTradeModes?${this.website.tokenHeader
-            }=${getToken()}${condition}`
-          );
-        }).catch(() => {
-          this.$message({
-            type: 'info',
-            message: '已取消' //
-          });
-        })
+        ]
       },
-      uploadBefore(file, done, loading) {
-        done();
-        loading = true;
+      page: {
+        pageSize: 10,
+        currentPage: 1,
+        total: 0,
+        pageSizes: [10, 20, 30, 40, 50, 100, 200, 300, 400, 500]
       },
-      // 上传成功
-      onSuccess(res, done, loading, column) {
-        this.excelBox = false;
-        this.$message.success("导入成功!");
-        loading = false;
-        this.onLoad(this.page);
-        done();
+      selectionList: [],
+      option: {
+        dialogDrag: true,
+      },
+      optionBack: {
+        dialogDrag: true,
+        height: 'auto',
+        stripe: true,
+        calcHeight: 30,
+        searchIcon: true,
+        searchIndex: 4,
+        tip: false,
+        searchShow: true,
+        searchMenuSpan: 24,
+        border: true,
+        index: true,
+        viewBtn: false,
+        selection: true,
+        dialogClickModal: false,
+        menuWidth: 140,
+        column: [
+          {
+            label: "编码",
+            prop: "code",
+            width: "180",
+            search: true,
+            slot: true,
+            rules: [{
+              required: true,
+              message: "请输入编码",
+              trigger: "blur"
+            }],
+            overHidden: true,
+          },
+          {
+            label: "中文名称",
+            prop: "cname",
+            width: "180",
+            search: true,
+            slot: true,
+            rules: [{
+              required: true,
+              message: "请输入中文名称",
+              trigger: "blur"
+            }],
+            overHidden: true,
+          },
+          {
+            label: "状态",
+            prop: "status",
+            type: "select",
+            search: true,
+            dicData: [{
+              label: '启用',
+              value: '0'
+            }, {
+              label: '停用',
+              value: '1'
+            }],
+            value: '0',
+            overHidden: true,
+          },
+          {
+            label: "创建人",
+            prop: "createUserName",
+            display: false,
+            overHidden: true,
+          },
+          {
+            label: "创建部门",
+            prop: "createDeptName",
+            display: false,
+            overHidden: true,
+          },
+          {
+            label: "创建时间",
+            prop: "createTime",
+            width: "160",
+            display: false,
+            overHidden: true,
+          },
+          {
+            label: "修改人",
+            prop: "updateUserName",
+            display: false,
+            overHidden: true,
+          },
+          {
+            label: "修改时间",
+            prop: "updateTime",
+            width: "160",
+            display: false,
+            overHidden: true,
+          },
+          {
+            label: "是否已删除(0 否 1是)",
+            prop: "isDeleted",
+            hide: true,
+            display: false,
+            overHidden: true,
+          },
+          {
+            label: "备注",
+            prop: "remarks",
+            type: 'textarea',
+            width: "180",
+            span: 24,
+            minRows: 3,
+            slot: true,
+            overHidden: true,
+          },
+        ]
       },
-      // 下载模板
-      handleGet() {
+      data: []
+    };
+  },
+  async created() {
+    this.option = await this.getColumnData(this.getColumnName(394), this.optionBack);
+  },
+  components: {
+    detailsPage,
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(this.permission.btrademodes_add, false),
+        viewBtn: this.vaildData(this.permission.btrademodes_view, false),
+        delBtn: this.vaildData(this.permission.btrademodes_delete, false),
+        editBtn: this.vaildData(this.permission.btrademodes_edit, false)
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    // 禁用启用按钮
+    statusfun(id, status) {
+      this.$confirm("确定将选择数据更改状态?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(() => {
+        getBtrademodesDetail(id).then(res => {
+          let obj = res.data.data;
+          obj.status = status
+          updateBtrademodes(obj).then(() => {
+            this.onLoad(this.page);
+            this.$message({
+              type: "success",
+              message: "操作成功!"
+            });
+          })
+        })
+      })
+    },
+    // 导出
+    handleExport() {
+      var condition = ''
+      for (const key in this.search) {
+        var value = this.search[key]
+        if (value) {
+          condition += `&${key}=${this.search[key]}`
+        }
+      }
+
+      this.$confirm('是否导出贸易条款?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
         window.open(
-          `/api/blade-los/btrademodes/exportBTradeModes/template?${this.website.tokenHeader
-          }=${getToken()}`
+          `/api/blade-los/btrademodes/exportBTradeModes?${this.website.tokenHeader
+          }=${getToken()}${condition}`
         );
-      },
-      // 新增
-      addbtnfun() {
-        this.form.status = 0
-        this.$refs.crud.rowAdd()
-      },
-      // 查看
-      rowViewfun(row, index) {
-        this.extendedDisabled = true
-        this.$refs.crud.rowView(row, index)
-      },
-      // 编辑
-      rowEditfun(row, index) {
-        getBtrademodesDetail(row.id).then(res => {
-          this.form = res.data.data;
-          this.$refs.crud.rowEdit(row, index)
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消' //
         });
-      },
-      rowSave(row, done, loading) {
-        addBtrademodes(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          window.console.log(error);
+      })
+    },
+    uploadBefore(file, done, loading) {
+      done();
+      loading = true;
+    },
+    // 上传成功
+    onSuccess(res, done, loading, column) {
+      this.excelBox = false;
+      this.$message.success("导入成功!");
+      loading = false;
+      this.onLoad(this.page);
+      done();
+    },
+    // 下载模板
+    handleGet() {
+      window.open(
+        `/api/blade-los/btrademodes/exportBTradeModes/template?${this.website.tokenHeader
+        }=${getToken()}`
+      );
+    },
+    // 新增
+    addbtnfun() {
+      this.form.status = 0
+      this.$refs.crud.rowAdd()
+    },
+    // 查看
+    rowViewfun(row, index) {
+      this.extendedDisabled = true
+      this.$refs.crud.rowView(row, index)
+    },
+    inEdit(row) {
+      this.detailData = {
+        id: row.id
+      };
+      this.isShow = false
+    },
+    // 编辑
+    rowEditfun(row, index) {
+      getBtrademodesDetail(row.id).then(res => {
+        this.form = res.data.data;
+        this.$refs.crud.rowEdit(row, index)
+      });
+    },
+    rowSave(row, done, loading) {
+      addBtrademodes(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      rowUpdate(row, index, done, loading) {
-        updateBtrademodes(row).then(() => {
-          this.onLoad(this.page);
-          this.$message({
-            type: "success",
-            message: "操作成功!"
-          });
-          done();
-        }, error => {
-          loading();
-          console.log(error);
+        done();
+      }, error => {
+        loading();
+        window.console.log(error);
+      });
+    },
+    rowUpdate(row, index, done, loading) {
+      updateBtrademodes(row).then(() => {
+        this.onLoad(this.page);
+        this.$message({
+          type: "success",
+          message: "操作成功!"
         });
-      },
-      rowDel(row) {
-        if (row.status === 1) {
-          this.$confirm("确定将选择数据删除?", {
-            confirmButtonText: "确定",
-            cancelButtonText: "取消",
-            type: "warning"
-          })
-            .then(() => {
-              return removeBtrademodes(row.id);
-            })
-            .then(() => {
-              this.onLoad(this.page);
-              this.$message({
-                type: "success",
-                message: "操作成功!"
-              });
-            });
-        } else {
-          this.$message({
-            message: '非禁用状态无法删除',
-            type: 'warning'
-          });
-        }
-      },
-      handleDelete() {
-        if (this.selectionList.length === 0) {
-          this.$message.warning("请选择至少一条数据");
-          return;
-        }
-  
-        for (const selection of this.selectionList) {
-          if (selection.status == 0) {
-            this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
-            return;
-          }
-        }
+        done();
+      }, error => {
+        loading();
+        console.log(error);
+      });
+    },
+    rowDel(row) {
+      if (row.status === 1) {
         this.$confirm("确定将选择数据删除?", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
           type: "warning"
         })
           .then(() => {
-            return removeBtrademodes(this.ids);
+            return removeBtrademodes(row.id);
           })
           .then(() => {
             this.onLoad(this.page);
@@ -396,104 +379,143 @@
               type: "success",
               message: "操作成功!"
             });
-            this.$refs.crud.toggleSelection();
-          });
-      },
-      beforeOpen(done, type) {
-        if (["edit", "view"].includes(type)) {
-          getBtrademodesDetail(this.form.id).then(res => {
-            this.form = res.data.data;
           });
-        }
-        done();
-      },
-      searchReset() {
-        this.query = {};
-        this.onLoad(this.page);
-      },
-      searchChange(params, done) {
-        this.query = params;
-        this.page.currentPage = 1;
-        this.onLoad(this.page, params);
-        done();
-      },
-      selectionChange(list) {
-        this.selectionList = list;
-      },
-      selectionClear() {
-        this.selectionList = [];
-        this.$refs.crud.toggleSelection();
-      },
-      currentChange(currentPage) {
-        this.page.currentPage = currentPage;
-      },
-      sizeChange(pageSize) {
-        this.page.pageSize = pageSize;
-      },
-      refreshChange() {
-        this.onLoad(this.page, this.query);
-      },
-      onLoad(page, params = {}) {
-        this.loading = true;
-        getBtrademodesList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.data = data.records;
-          this.loading = false;
-          this.selectionClear();
+      } else {
+        this.$message({
+          message: '非禁用状态无法删除',
+          type: 'warning'
         });
-      },
-      //自定义列保存
-      async saveColumnTwo(ref, option, optionBack, code) {
-        /**
-         * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
-         * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
-         * 一定要执行异步操作,要等接口成功返回,才能执行下一行编码
-         */
-        const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
-        if (inSave) {
-          this.$message.success("保存成功");
-          //关闭窗口
-          this.$refs[ref].$refs.dialogColumn.columnBox = false;
-        }
-      },
-      //自定义列重置
-      async resetColumnTwo(ref, option, optionBack, code) {
-        this[option] = this[optionBack];
-        const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
-        if (inSave) {
-          this.$message.success("重置成功");
-          this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+
+      for (const selection of this.selectionList) {
+        if (selection.status == 0) {
+          this.$message.warning("选中的数据中有启用数据,启用数据不可删除!");
+          return;
         }
-      },
-      // 更改表格颜色
-      headerClassName(tab) {
-        //颜色间隔
-        let back = ""
-        if (tab.columnIndex >= 0 && tab.column.level === 1) {
-          if (tab.columnIndex % 2 === 0) {
-            back = "back-one"
-          } else if (tab.columnIndex % 2 === 1) {
-            back = "back-two"
-          }
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return removeBtrademodes(this.ids);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+          this.$refs.crud.toggleSelection();
+        });
+    },
+    beforeOpen(done, type) {
+      if (["edit", "view"].includes(type)) {
+        getBtrademodesDetail(this.form.id).then(res => {
+          this.form = res.data.data;
+        });
+      }
+      done();
+    },
+    searchReset() {
+      this.query = {};
+      this.onLoad(this.page);
+    },
+    searchChange(params, done) {
+      this.query = params;
+      this.page.currentPage = 1;
+      this.onLoad(this.page, params);
+      done();
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.crud.toggleSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+    },
+    refreshChange() {
+      this.onLoad(this.page, this.query);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+      getBtrademodesList(page.currentPage, page.pageSize, Object.assign(params, this.query)).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    },
+    goBack() {
+      this.detailData = {}
+      this.isShow = true;
+      this.onLoad(this.page, this.search);
+    },
+    //自定义列保存
+    async saveColumnTwo(ref, option, optionBack, code) {
+      /**
+       * 已定义全局方法,直接使用,saveColumnData保存列数据方法,参数传值(表格名称,当前表格的option数据)
+       * 已定义全局方法,直接使用,getColumnName方法用来获取枚举值,参数根据自己定义的code值获取中文名
+       * 一定要执行异步操作,要等接口成功返回,才能执行下一行编码
+       */
+      const inSave = await this.saveColumnData(this.getColumnName(code), this[option]);
+      if (inSave) {
+        this.$message.success("保存成功");
+        //关闭窗口
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    //自定义列重置
+    async resetColumnTwo(ref, option, optionBack, code) {
+      this[option] = this[optionBack];
+      const inSave = await this.delColumnData(this.getColumnName(code), this[optionBack]);
+      if (inSave) {
+        this.$message.success("重置成功");
+        this.$refs[ref].$refs.dialogColumn.columnBox = false;
+      }
+    },
+    // 更改表格颜色
+    headerClassName(tab) {
+      //颜色间隔
+      let back = ""
+      if (tab.columnIndex >= 0 && tab.column.level === 1) {
+        if (tab.columnIndex % 2 === 0) {
+          back = "back-one"
+        } else if (tab.columnIndex % 2 === 1) {
+          back = "back-two"
         }
-        return back;
-      },
-    }
-  };
-  </script>
-  
-  <style lang="scss" scoped>
-  ::v-deep#out-table .back-one {
-    background: #ecf5ff !important;
-  }
-  
-  ::v-deep#out-table .back-two {
-    background: #ecf5ff !important;
+      }
+      return back;
+    },
   }
+};
+</script>
   
-  /deep/ .el-col-md-8 {
-    width: 24.33333%;
-  }
-  </style>
+<style lang="scss" scoped>
+::v-deep#out-table .back-one {
+  background: #ecf5ff !important;
+}
+
+::v-deep#out-table .back-two {
+  background: #ecf5ff !important;
+}
+
+/deep/ .el-col-md-8 {
+  width: 24.33333%;
+}
+</style>
   

+ 3 - 3
src/views/tirePartsMall/financialManagement/purchaseDetail/index.vue

@@ -179,7 +179,7 @@ export default {
                     prop: 'businesDate',
                     overHidden: true,
                 }, {
-                    label: '库时间',
+                    label: '库时间',
                     prop: 'deliveryBusinesDate',
                     overHidden: true,
                 }, {
@@ -268,7 +268,7 @@ export default {
                     valueFormat: "yyyy-MM-dd",
                 },
                 {
-                    label: '库开始',
+                    label: '库开始',
                     prop: 'dateStart',
                     overHidden: true,
                     search: true,
@@ -279,7 +279,7 @@ export default {
                     valueFormat: "yyyy-MM-dd",
                 },
                 {
-                    label: '库结束',
+                    label: '库结束',
                     prop: 'dateEnd',
                     overHidden: true,
                     search: true,

+ 3 - 3
src/views/tirePartsMall/financialManagement/saleDetail/index.vue

@@ -181,7 +181,7 @@ export default {
                     prop: 'businesDate',
                     overHidden: true,
                 }, {
-                    label: '库时间',
+                    label: '库时间',
                     prop: 'deliveryBusinesDate',
                     overHidden: true,
                 }, {
@@ -281,7 +281,7 @@ export default {
                     format: "yyyy-MM-dd",
                     valueFormat: "yyyy-MM-dd",
                 }, {
-                    label: '库开始',
+                    label: '库开始',
                     prop: 'dateStart',
                     overHidden: true,
                     search: true,
@@ -291,7 +291,7 @@ export default {
                     format: "yyyy-MM-dd",
                     valueFormat: "yyyy-MM-dd",
                 }, {
-                    label: '库结束',
+                    label: '库结束',
                     prop: 'dateEnd',
                     overHidden: true,
                     search: true,

+ 56 - 7
src/views/tradeAgency/exchangePurchasing/detailsPage.vue

@@ -14,7 +14,7 @@
                     @click="$refs.report.openDialog()">报表设计
                 </el-button> -->
                 <el-button v-if="!editDisabled" class="el-button--small-yh" type="success" size="small"
-                    :disabled="isSaveBtn || form.firstStatus != '审核通过' || form.orderStatus == '已确认'" @click="submitFee">确认付款
+                    :disabled="isSaveBtn || form.firstStatus != '审核通过' || form.orderStatus == '已确认'" @click="setPay">确认付款
                 </el-button>
                 <el-button v-if="!editDisabled" class="el-button--small-yh" type="warning" size="small"
                     :disabled="isSaveBtn || form.firstStatus != '审核通过' || form.orderStatus != '已确认'" @click="revokeFee">撤销付款
@@ -60,18 +60,29 @@
             </trade-card> -->
             <trade-card title="费用明细">
                 <fee-infosimple ref="feeInfo" feeType="C" :form="form"
-                    :disabled="editDisabled || form.firstStatus == '审核通过'" @getDetails="getDetails"></fee-infosimple>
+                    :disabled="editDisabled || form.orderStatus == '已确认'" @getDetails="getDetails"></fee-infosimple>
             </trade-card>
             <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
-                deleteUrl="/blade-purchase-sales/orderfiles/update" display
-                :disabled="editDisabled || form.orderStatus == '已确认' || form.orderStatus == '已确认'"></c-upload>
+                deleteUrl="/api/blade-los/filescenter/remove" display
+                :disabled="editDisabled || form.orderStatus == '已确认'"></c-upload>
             <!--审核弹窗-->
             <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
                 :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
                 <check-schedule :checkId="checkId" :batchNo="batchNo" @choceScheduleFun="choceScheduleFun"></check-schedule>
             </el-dialog>
         </div>
+        <el-dialog title="确认付费" :visible.sync="dialogVisible" width="400px" :before-close="handleClose"
+            :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag
+            append-to-body>
+            <span>
+                <avue-form v-model="feeForm" :option="feeOption"></avue-form>
+            </span>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="submitFee">确 定</el-button>
+            </span>
+        </el-dialog>
         <!-- <business-reports :id="form.id" ref="print" businessValue="MYDL" :type="true"></business-reports>
         <reports :id="form.id" :assemblyForm="form" businessValue="MYDL" ref="report"></reports> -->
     </div>
@@ -85,12 +96,16 @@ import dicSelect from "@/components/dicSelect/main";
 import checkSchedule from "@/components/checkH/checkSchedule.vue";
 import businessReports from "@/components/tradeAgency/businessReports.vue";
 import reports from "@/components/tradeAgency/reports.vue";
+import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
+import { dateFormat } from "@/util/date";
 import _ from "lodash";
 export default {
     name: "detailsPage",
 
     data() {
         return {
+            feeForm: {},
+            dialogVisible: false,
             checkId: '', // 审核需要的id
             batchNo: '',
             checkScheduleDialog: false, // 审核弹窗
@@ -309,6 +324,21 @@ export default {
                     }
                 ]
             },
+            feeOption: {
+                labelPosition: 'top',
+                menuBtn: false,
+                span: 24,
+                column: [
+                    {
+                        label: '结算汇率',
+                        prop: "exchangeRate",
+                    },
+                    {
+                        label: '优惠汇率',
+                        prop: "discountRate",
+                    },
+                ]
+            },
             showLock: false,
             roleName: [],
             saberUserInfo: ''
@@ -343,6 +373,21 @@ export default {
         }
     },
     methods: {
+        setPay() {
+            bcurrencyGetExrate({ date: dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss'), dc: "D" }).then(res => {
+                res.data.data.forEach(e => {
+                    if (e.code == 'USD') {
+                        this.feeForm.exchangeRate = e.exrate
+                        this.feeForm.discountRate = e.exrate
+                    }
+                })
+            })
+            this.dialogVisible = true
+        },
+        handleClose() {
+            this.feeForm = {}
+            this.dialogVisible = false
+        },
         inLock() {
             const data = {
                 moduleName: "MYDL-C",
@@ -426,7 +471,12 @@ export default {
             });
         },
         submitFee() {
-            confirmReceived(this.form).then(res => {
+            this.dialogVisible = false
+            let obj = {
+                ...this.form,
+                ...this.feeForm
+            }
+            confirmReceived(obj).then(res => {
                 this.$confirm(res.data.data + '?', '提示', {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
@@ -438,8 +488,7 @@ export default {
                         spinner: 'el-icon-loading',
                         background: 'rgba(255,255,255,0.7)'
                     });
-
-                    confirmThePayment(this.form).then(res => {
+                    confirmThePayment(obj).then(res => {
                         this.getDetails(res.data.data.id)
                         this.$message.success("确认成功");
                     }).finally(() => {

+ 32 - 18
src/views/tradeAgency/firstSettlement/detailsPage.vue

@@ -39,7 +39,7 @@
             </trade-card>
             <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
-                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload>
+                deleteUrl="/api/blade-los/filescenter/remove" display :disabled="editDisabled"></c-upload>
             <business-reports :id="form.id" ref="print" businessValue="MYDL-STL" :type="true"></business-reports>
             <reports :id="form.id" :assemblyForm="form" businessValue="MYDL-STL" ref="report"></reports>
         </div>
@@ -53,6 +53,8 @@ import feeInfosimple from "@/components/tradeAgency/fee-infosimple";
 import dicSelect from "@/components/dicSelect/main";
 import businessReports from "@/components/tradeAgency/businessReports.vue";
 import reports from "@/components/tradeAgency/reports.vue";
+import { bcurrencyGetExrate } from "@/api/iosBasicData/rateManagement";
+import { dateFormat } from "@/util/date";
 import _ from "lodash";
 export default {
     name: "detailsPage",
@@ -389,25 +391,37 @@ export default {
             });
         },
         submitFee() {
-            this.$confirm('确认收费?', '提示', {
-                confirmButtonText: '确定',
-                cancelButtonText: '取消',
-                type: 'warning'
-            }).then(() => {
-                const loading = this.$loading({
-                    lock: true,
-                    text: '加载中',
-                    spinner: 'el-icon-loading',
-                    background: 'rgba(255,255,255,0.7)'
-                });
-                confirmCollectionOfPayments(this.form).then(res => {
-                    this.getDetails(res.data.data.id)
-                    this.$message.success("确认成功");
-                }).finally(() => {
-                    loading.close();
+            bcurrencyGetExrate({ date: dateFormat(new Date(), 'yyyy-MM-dd hh:mm:ss'), dc: "D" }).then(res => {
+                res.data.data.forEach(e => {
+                    if (e.code == 'USD') {
+                        this.$prompt('<br/>请输入当天汇率:', '确定收费', {
+                            confirmButtonText: '确定',
+                            cancelButtonText: '取消',
+                            inputValue: e.exrate,
+                            dangerouslyUseHTMLString: true,
+                            closeOnClickModal: false,
+                        }).then(({ value }) => {
+                            let obj = {}
+                            obj = {
+                                ...this.form,
+                                exchangeRate: value
+                            }
+                            const loading = this.$loading({
+                                lock: true,
+                                text: '加载中',
+                                spinner: 'el-icon-loading',
+                                background: 'rgba(255,255,255,0.7)'
+                            });
+                            confirmCollectionOfPayments(obj).then(res => {
+                                this.getDetails(res.data.data.id)
+                                this.$message.success("确认成功");
+                            }).finally(() => {
+                                loading.close();
+                            })
+                        })
+                    }
                 })
             })
-
         },
         revokeFee() {
             this.$confirm('撤销收费?', '提示', {

+ 51 - 36
src/views/tradeAgency/oceanFreightImport/detailsPage.vue

@@ -74,19 +74,22 @@
                     <tempalte slot="corpCnName">
                         <dic-select v-model="form.corpCnName" placeholder="客户" key="id" label="cnName" res="records"
                             url="/blade-los/bcorps/listByType?corpTypeName=客户" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="dicChange('corpCnName', $event)" :disabled="editDisabled"
+                            dataName="cnName" @selectChange="dicChange('corpCnName', $event)"
+                            :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
                     <tempalte slot="polCnName">
                         <dic-select v-model="form.polCnName" placeholder="起运港" key="id" label="cnName" res="records"
                             url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
-                            @selectChange="dicChange('polCnName', $event)" :disabled="editDisabled"
+                            @selectChange="dicChange('polCnName', $event)"
+                            :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
                     <tempalte slot="podCnName">
                         <dic-select v-model="form.podCnName" placeholder="目的港" key="id" label="cnName" res="records"
                             url="/blade-los/bports/list" :filterable="true" :remote="true" dataName="cnName"
-                            @selectChange="dicChange('podCnName', $event)" :disabled="editDisabled"
+                            @selectChange="dicChange('podCnName', $event)"
+                            :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
                     <!-- <tempalte slot="srcCnName">
@@ -118,41 +121,45 @@
                     <tempalte slot="hshipperCnName">
                         <dic-select v-model="form.hshipperCnName" placeholder="发货人" key="id" label="cnName" res="records"
                             url="/blade-los/bcorps/listByType?corpTypeName=国外工厂" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="dicChange('hshipperCnName', $event)" :disabled="editDisabled"
+                            dataName="cnName" @selectChange="dicChange('hshipperCnName', $event)"
+                            :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
                     <tempalte slot="hconsigneeCnName">
                         <dic-select v-model="form.hconsigneeCnName" placeholder="收货人" key="id" label="cnName" res="records"
                             url="/blade-los/bcorps/listByType?corpTypeName=国内贸易商" :filterable="true" :remote="true"
-                            dataName="cnName" @selectChange="dicChange('hconsigneeCnName', $event)" :disabled="editDisabled"
+                            dataName="cnName" @selectChange="dicChange('hconsigneeCnName', $event)"
+                            :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
                             :searchShow="true"></dic-select>
                     </tempalte>
                     <tempalte slot="carrierCnName">
                         <dic-select v-model="form.carrierCnName" placeholder="船公司" key="id" label="cnName" res="records"
                             url="/blade-los/bcorps/listByType?corpTypeName=船公司" :filterable="true" :remote="true"
                             dataName="cnName" @selectChange="dicChange('carrierCnName', $event)"
-                            :disabled="editDisabled"></dic-select>
+                            :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></dic-select>
                     </tempalte>
                     <tempalte slot="bookingAgentCnName">
                         <dic-select v-model="form.bookingAgentCnName" placeholder="船代" key="id" label="cnName" res="records"
                             url="/blade-los/bcorps/listByType?corpTypeName=船代" :filterable="true" :remote="true"
                             dataName="cnName" @selectChange="dicChange('bookingAgentCnName', $event)"
-                            :disabled="editDisabled" :searchShow="true"></dic-select>
+                            :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
+                            :searchShow="true"></dic-select>
                     </tempalte>
                     <template slot="hscode">
                         <div style="display:flex;">
                             <dic-select v-model="form.hscode" placeholder="品名" key="id" res="records" label="hsCode"
                                 url="/blade-los/bcommodity/list" :filterable="true" :remote="true" dataName="hsCode"
-                                @selectChange="dicChange('hscode', $event)" :disabled="editDisabled"></dic-select>
+                                @selectChange="dicChange('hscode', $event)"
+                                :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></dic-select>
                             <el-input style="margin-left: 10px;" v-model="form.commodityCnName" placeholder="请输入品名"
-                                :disabled="editDisabled"></el-input>
+                                :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"></el-input>
                         </div>
                     </template>
                     <tempalte slot="mnotifyCntyCode" slot-scope="{ row }">
                         <dic-select v-model="form.mnotifyCntyCode" placeholder="原产地" key="id" label="cnName" res="records"
                             url="/blade-los/bcountrys/list" :filterable="true" :remote="true" dataName="cnName"
-                            :disabled="editDisabled" @selectChange="dicChange('mnotifyCntyCode', $event)"
-                            :searchShow="true"></dic-select>
+                            :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
+                            @selectChange="dicChange('mnotifyCntyCode', $event)" :searchShow="true"></dic-select>
                     </tempalte>
                 </avue-form>
             </trade-card>
@@ -161,8 +168,9 @@
                     @selection-change="selectionChange" @resetColumn="resetColumn('crud', 'option', 'optionBack', 388)"
                     @saveColumn="saveColumn('crud', 'option', 'optionBack', 388)">
                     <template slot="indexHeader" slot-scope="{row,index}">
-                        <el-button type="primary" size="mini" icon="el-icon-plus" :disabled="editDisabled" circle
-                            @click="addRow()">
+                        <el-button type="primary" size="mini" icon="el-icon-plus"
+                            :disabled="editDisabled || form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') !== -1"
+                            circle @click="addRow()">
                         </el-button>
                     </template>
                     <template slot="cntrTypeCodeHeader" slot-scope="{column}">
@@ -199,10 +207,10 @@
                             :filterable="true"></dic-select>
                         <span v-else>{{ row.goodsType }}</span>
                     </tempalte>
-                    <tempalte slot="quantity" slot-scope="{ row }">
-                        <el-input-number v-if="row.$cellEdit && !row.srcId" v-model="row.quantity" :controls="false"
+                    <tempalte slot="number" slot-scope="{ row }">
+                        <el-input-number v-if="row.$cellEdit && !row.srcId" v-model="row.number" :controls="false"
                             placeholder="请输入 件数" size="small" style="width: 100%;"></el-input-number>
-                        <span v-else>{{ row.quantity }}</span>
+                        <span v-else>{{ row.number }}</span>
                     </tempalte>
                     <tempalte slot="netWeight" slot-scope="{ row }">
                         <el-input-number v-if="row.$cellEdit && !row.srcId" v-model="row.netWeight" :controls="false"
@@ -221,8 +229,7 @@
                             @click="rowCell('派车', row, index)">{{ row.type == 1 ? '撤销派车' : '派车' }}</el-button>
                         <el-button size="small" type="text" :disabled="editDisabled || row.type == 1"
                             @click="rowCell('自提', row, index)">{{ row.type == 2 ? '撤销自提' : '自 提' }}</el-button>
-                        <el-button size="small" type="text"
-                            :disabled="editDisabled || row.whetherDispatchVehicles == 1"
+                        <el-button size="small" type="text" :disabled="editDisabled || row.whetherDispatchVehicles == 1"
                             @click="rowCell('箱删除', row, index)">删 除</el-button>
                     </template>
                 </avue-crud>
@@ -336,10 +343,11 @@
                 <fee-info ref="feeInfo" :form="form" :disabled="editDisabled" @getDetails="getDetails"></fee-info>
             </trade-card>
             <containerTitle title="上传附件"></containerTitle>
-            <c-upload :data="form.filesList" :enumerationValue="76" deleteUrl="/blade-purchase-sales/orderfiles/update"
-                display :disabled="editDisabled"></c-upload>
+            <c-upload :data="form.filesList" :enumerationValue="76" deleteUrl="/api/blade-los/filescenter/remove" display
+                :disabled="editDisabled"></c-upload>
         </div>
-        <business-reports :id="form.id" ref="print" businessValue="HYJK" classifyCode="业务" groupCode="销售报告" :type="1"></business-reports>
+        <business-reports :id="form.id" ref="print" businessValue="HYJK" classifyCode="业务" groupCode="销售报告"
+            :type="1"></business-reports>
         <!--审核弹窗-->
         <el-dialog append-to-body title="审批进度" class="el-dialogDeep" :visible.sync="checkScheduleDialog" width="40%"
             :close-on-click-modal="false" :destroy-on-close="true" :close-on-press-escape="false" v-dialog-drag>
@@ -372,6 +380,7 @@ export default {
                 businessType: 'SI',
                 status: 0,
                 seaType: 'I',
+                billingStatus: 0,
                 mshipperCntyName: '一般贸易',
                 feeCenterListC: [],
                 feeCenterListD: [],
@@ -387,6 +396,7 @@ export default {
                 businessType: 'SI',
                 status: 0,
                 seaType: 'I',
+                billingStatus: 0,
                 mshipperCntyName: '一般贸易',
                 feeCenterListC: [],
                 feeCenterListD: [],
@@ -749,7 +759,7 @@ export default {
                     },
                     {
                         label: "件数",
-                        prop: "quantity",
+                        prop: "number",
                         width: "100",
                         overHidden: true
                     },
@@ -1521,8 +1531,8 @@ export default {
         rowCell(name, row, index) {
             if (name == '箱编辑') {
                 if (row.$cellEdit == true) {
-                    if (!row.cntrTypeCode || !row.boxNo || !row.goodsName || !row.goodsType || !row.quantity || !row.netWeight || !row.price) {
-                        return this.$message.error((!row.cntrTypeCode ? "箱型," : '') + (!row.boxNo ? "箱号," : '') + (!row.goodsName ? "品名," : '') + (!row.goodsType ? "类型," : '') + (!row.quantity ? "件数," : '') + (!row.netWeight ? "重量," : '') + (!row.price ? "单价" : '') + "不能为空");
+                    if (!row.cntrTypeCode || !row.boxNo || !row.goodsName || !row.goodsType || !row.number || !row.netWeight || !row.price) {
+                        return this.$message.error((!row.cntrTypeCode ? "箱型," : '') + (!row.boxNo ? "箱号," : '') + (!row.goodsName ? "品名," : '') + (!row.goodsType ? "类型," : '') + (!row.number ? "件数," : '') + (!row.netWeight ? "重量," : '') + (!row.price ? "单价" : '') + "不能为空");
                     }
                     this.$set(row, "$cellEdit", false);
                 } else {
@@ -1606,6 +1616,9 @@ export default {
                 }
             }
             if (name == '派车') {
+                if (!row.id) {
+                    return this.$message.error('请保存数据');
+                }
                 if (row.whetherMachineInspection == 1) {
                     if (!row.inspectionType || !row.inspectionDate) {
                         return this.$message.error((!row.inspectionType ? "查验类型," : '') + (!row.inspectionDate ? "查验时间" : '') + "不能为空");
@@ -1645,6 +1658,9 @@ export default {
 
             }
             if (name == '自提') {
+                if (!row.id) {
+                    return this.$message.error('请保存数据');
+                }
                 let obj = {
                     ...row,
                     type: 2,
@@ -1704,6 +1720,7 @@ export default {
                     });
                     revokeDispatchVehicles(row).then(res => {
                         this.$message.success("撤销成功");
+                        this.optionForm.disabled = false
                         this.getDetails(this.form.id)
                     }).finally(() => {
                         loading.close()
@@ -1718,6 +1735,7 @@ export default {
                     });
                     confirmDispatchVehicles(row).then(res => {
                         this.$message.success("派车成功");
+                        this.optionForm.disabled = true
                         this.getDetails(this.form.id)
                     }).finally(() => {
                         loading.close()
@@ -1910,15 +1928,10 @@ export default {
                 background: 'rgba(255,255,255,0.7)'
             });
             billsCopyBills({ id: id }).then(res => {
+                console.log(res.data.data, 33333333333333)
                 res.data.data.billNoFormat = 'HYJK'
                 res.data.data.businessTypeCode = 'HYJK'
                 this.form = res.data.data
-                if (res.data.data.abroadConsignorId) {
-                    this.$refs.abankCode.IdGetDicData({ id: res.data.data.abroadConsignorId })
-                }
-                if (res.data.data.domesticConsigneeId) {
-                    this.$refs.dbankCode.IdGetDicData({ id: res.data.data.domesticConsigneeId })
-                }
             }).finally(() => {
                 loading.close()
             })
@@ -1926,8 +1939,10 @@ export default {
         inEdit() {
             this.editButton = false
             if (this.form.status == 0 || this.form.status == 4) {
+                if (this.form.dispatchVehiclesList.findIndex(item => item.whetherDispatchVehicles == '1') == -1) {
+                    this.optionForm.disabled = false
+                }
                 this.editDisabled = false
-                this.optionForm.disabled = false
             }
         },
         allClick(name) {
@@ -1938,8 +1953,8 @@ export default {
                 if (valid) {
                     for (let row of this.form.preContainersList) {
                         console.log(row)
-                        if (!row.cntrTypeCode || !row.boxNo || !row.goodsName || !row.goodsType || !row.quantity || !row.netWeight || !row.price) {
-                            return this.$message.error("箱信息:"+(!row.cntrTypeCode ? "箱型," : '') + (!row.boxNo ? "箱号," : '') + (!row.goodsName ? "品名," : '') + (!row.goodsType ? "类型," : '') + (!row.quantity ? "件数," : '') + (!row.netWeight ? "重量," : '') + (!row.price ? "单价" : '') + "不能为空");
+                        if (!row.cntrTypeCode || !row.boxNo || !row.goodsName || !row.goodsType || !row.number || !row.netWeight || !row.price) {
+                            return this.$message.error("箱信息:" + (!row.cntrTypeCode ? "箱型," : '') + (!row.boxNo ? "箱号," : '') + (!row.goodsName ? "品名," : '') + (!row.goodsType ? "类型," : '') + (!row.number ? "件数," : '') + (!row.netWeight ? "重量," : '') + (!row.price ? "单价" : '') + "不能为空");
                         }
                     }
                     if (this.$refs.feeInfo.submitValidate()) {
@@ -2122,7 +2137,7 @@ export default {
 .el-table--small th {
     padding: 2px !important;
 }
-::v-deep .el-card__body{
+
+::v-deep .el-card__body {
     padding: 3px 10px;
-}
-</style>
+}</style>

+ 56 - 15
src/views/tradeAgency/oceanFreightImport/index.vue

@@ -14,6 +14,15 @@
                     </el-checkbox-group>
                     <!-- <avue-form v-model="query.checkbox" :option="checkboxOption"></avue-form> -->
                 </template>
+                <template slot="status" slot-scope="{ row }">
+                    <div>
+                        <span v-if="row.status == item.dictKey" v-for="(item, index) in auditStatusList" :key="index"
+                            :style="{ 'background-color': item.colour }"
+                            style="color: #fff;border-radius: 30px;padding: 2px 15px;text-align: center;">
+                            {{ item.dictValue }}
+                        </span>
+                    </div>
+                </template>
                 <template slot="menuLeft">
                     <el-button type="primary" size="small" icon="el-icon-plus" @click="addButton">新 增
                     </el-button>
@@ -40,9 +49,11 @@
 import { getList, remove, copyAgent } from "@/api/tradeAgency/oceanFreightImport";
 import detailsPage from "./detailsPage";
 import { getToken } from "@/util/auth";
+import { getWorkDicts } from "@/api/system/dictbiz";
 export default {
     data() {
         return {
+            auditStatusList: [],
             detailData: {},
             isShow: true,
             form: {},
@@ -101,6 +112,22 @@ export default {
                 searchIndex: 3,
                 column: [
                     {
+                        label: "是否退押",
+                        prop: "billingStatus",
+                        width: "70",
+                        type: 'select',
+                        dicData: [{
+                            label: '是',
+                            value: 1
+                        }, {
+                            label: '否',
+                            value: 0
+                        }],
+                        searchOrder: 10,
+                        search: true,
+                        overHidden: true
+                    },
+                    {
                         label: "客户名称",
                         prop: "corpCnName",
                         width: "120",
@@ -148,6 +175,30 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "应收结算状态",
+                        prop: "stlDrStatusDescr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "应付结算状态",
+                        prop: "stlCrStatusDescr",
+                        width: "160",
+                        overHidden: true,
+                    },
+                    {
+                        label: "审核状态",
+                        prop: "status",
+                        type: 'select',
+                        dicUrl: "/api/blade-system/dict-biz/dictionary?code=audit_status_los",
+                        width: '120',
+                        props: {
+                            label: "dictValue",
+                            value: "dictKey"
+                        },
+                        overHidden: true,
+                    },
+                    {
                         label: "发货人",
                         prop: "hshipperCnName",
                         width: "80",
@@ -303,20 +354,6 @@ export default {
                         overHidden: true
                     },
                     {
-                        label: "是否退押",
-                        prop: "billingStatus",
-                        width: "100",
-                        type: 'select',
-                        dicData: [{
-                            label: '是',
-                            value: 1
-                        }, {
-                            label: '否',
-                            value: 0
-                        }],
-                        overHidden: true
-                    },
-                    {
                         label: '贸易方式',
                         prop: "mshipperCntyName",
                         width: "100",
@@ -372,6 +409,10 @@ export default {
     },
     async created() {
         this.option = await this.getColumnData(this.getColumnName(387), this.optionBack);
+        // 获取业务审核状态
+        getWorkDicts('audit_status_los').then(res => {
+            this.auditStatusList = res.data.data;
+        })
     },
     activated() {
         setTimeout(() => {
@@ -379,7 +420,7 @@ export default {
                 this.isShow = false
                 this.$store.commit("IN_OCEANFS_DETAIL");
             }
-            if(this.$route.query.home){
+            if (this.$route.query.home) {
                 this.isShow = false
             }
         }, 100);

+ 1 - 1
src/views/tradeAgency/tradeAgency/detailsPage.vue

@@ -361,7 +361,7 @@
             </trade-card>
             <containerTitle title="上传附件"></containerTitle>
             <c-upload :data="form.filesCenterList" :enumerationValue="76"
-                deleteUrl="/blade-purchase-sales/orderfiles/update" display :disabled="editDisabled"></c-upload>
+                deleteUrl="/api/blade-los/filescenter/remove" display :disabled="editDisabled"></c-upload>
         </div>
         <business-reports :id="form.id" :itemIds="itemIds" ref="print" businessValue="MYDL" :type="true"></business-reports>
         <reports :id="form.id" :assemblyForm="form" businessValue="MYDL" ref="report"></reports>