修改海运进出口列表页 出库统计 销售订单 共享销售限制规则

src/views/iosBasicData/OceanFreightImport/bills/index.vue

@@ -654,16 +654,16 @@ export default {
                     },
                     {
                         label: "船名",
-                        prop: "vesselCnName",
+                        prop: "vesselEnName",
                         overHidden: true,
                         type: 'select',
                         dicData: [],
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bvessels/list?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bvessels/list?enName={{key}}",
                         props: {
-                            label: 'cnName',
-                            value: 'cnName',
+                            label: 'enName',
+                            value: 'enName',
                             res: 'data.records'
                         },
                         search: true,
@@ -712,16 +712,16 @@ export default {
                     },
                     {
                         label: "船公司",
-                        prop: "carrierCnName",
+                        prop: "carrierEnName",
                         overHidden: true,
                         type: 'select',
                         dicData: [],
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bcorps/listByType?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bcorps/listByType?enName={{key}}",
                         props: {
-                            label: 'cnName',
-                            value: 'cnName',
+                            label: 'enName',
+                            value: 'enName',
                             res: 'data.records'
                         },
                         search: true,
@@ -735,6 +735,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "卸货港",
+                        prop: "podCnName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: "目的港",
                         prop: "podEnName",
                         width: "120",
@@ -754,6 +760,12 @@ export default {
                         searchOrder: 11,
                     },
                     {
+                        label: "交货地",
+                        prop: "placeDeliveryName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: "航线",
                         prop: "lineCnName",
                         width: "120",
@@ -1509,15 +1521,15 @@ export default {
         vesselBvesselsListfun(enName) {
             getBvesselsList(1, 10, { enName, status: 0 }).then(res => {
                 this.vesselData = res.data.data.records
-                this.findObject(this.option.column, "vesselCnName").dicData = res.data.data.records
+                this.findObject(this.option.column, "vesselEnName").dicData = res.data.data.records
             })
         },
         // 获取船公司数据
-        carrierBcorpslistByTypefun(cnName) {
+        carrierBcorpslistByTypefun(enName) {
             let corpTypeName = '船公司'
-            getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
+            getBcorpslistByType(1, 10, { enName, status: 0, corpTypeName }).then(res => {
                 this.carrierData = res.data.data.records
-                this.findObject(this.option.column, "carrierCnName").dicData = res.data.data.records
+                this.findObject(this.option.column, "carrierEnName").dicData = res.data.data.records
             })
         },
         // 卸货港数据

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

@@ -979,11 +979,13 @@ export default {
                 this.saveLoading = false
                 // 判断data是否有值，没有值说明不成功给个弹窗返回
                 if (!res.data.data) {
-                    let text = res.data.msg
+                    let text = res.data.msg.replace("\r\n", "<br>");
+                    console.log(text)
                     this.$message({
                         type: 'warning',
                         dangerouslyUseHTMLString: true,
-                        message: `<p>${text.slice(text.indexOf('非空'), text.indexOf('特殊字符'))}</p><p>${text.slice(text.indexOf('特殊字符'), text.indexOf('长度超长'))}</p><p>${text.slice(text.indexOf('长度超长'), text.indexOf('其他'))}</p><p>${text.slice(text.indexOf('其他'))}</p>`,
+                        message:text,
+                        // message: `<p>${text.slice(text.indexOf('非空'), text.indexOf('特殊字符'))}</p><p>${text.slice(text.indexOf('特殊字符'), text.indexOf('长度超长'))}</p><p>${text.slice(text.indexOf('长度超长'), text.indexOf('其他'))}</p><p>${text.slice(text.indexOf('其他'))}</p>`,
                         duration: 5000
                     });
                 } else {

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

@@ -755,15 +755,15 @@ export default {
                     },
                     {
                         label: "船名",
-                        prop: "vesselCnName",
+                        prop: "vesselEnName",
                         overHidden: true,
                         type: 'select',
                         filterable: true,
                         remote: true,
-                        dicUrl: "/api/blade-los/bvessels/list?cnName={{key}}",
+                        dicUrl: "/api/blade-los/bvessels/list?enName={{key}}",
                         props: {
-                            label: 'cnName',
-                            value: 'cnName',
+                            label: 'enName',
+                            value: 'enName',
                             res: 'data.records'
                         },
                         search: true,
@@ -843,6 +843,12 @@ export default {
                         overHidden: true,
                     },
                     {
+                        label: "卸货港",
+                        prop: "podCnName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: "目的港",
                         prop: "podEnName",
                         width: "120",
@@ -861,6 +867,12 @@ export default {
                         searchOrder: 11,
                     },
                     {
+                        label: "交货地",
+                        prop: "placeDeliveryName",
+                        width: "120",
+                        overHidden: true,
+                    },
+                    {
                         label: "航线",
                         prop: "lineCnName",
                         width: "120",
@@ -1618,15 +1630,15 @@ export default {
         vesselBvesselsListfun(enName) {
             getBvesselsList(1, 10, { enName, status: 0 }).then(res => {
                 this.vesselData = res.data.data.records
-                this.findObject(this.option.column, "vesselCnName").dicData = res.data.data.records
+                this.findObject(this.option.column, "vesselEnName").dicData = res.data.data.records
             })
         },
         // 获取船公司数据
-        carrierBcorpslistByTypefun(cnName) {
+        carrierBcorpslistByTypefun(enName) {
             let corpTypeName = '船公司'
-            getBcorpslistByType(1, 10, { cnName, status: 0, corpTypeName }).then(res => {
+            getBcorpslistByType(1, 10, { enName, status: 0, corpTypeName }).then(res => {
                 this.carrierData = res.data.data.records
-                this.findObject(this.option.column, "carrierCnName").dicData = res.data.data.records
+                this.findObject(this.option.column, "carrierEnName").dicData = res.data.data.records
             })
         },
         // 卸货港数据

src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -558,7 +558,7 @@ export default {
       //   version = '0'
       // }
 
-      this.form.url=response.data.link
+      this.form.url = response.data.link
       submit({
         ...this.form
       }).then(res => {

src/views/tirePartsMall/basicData/sharedSales/detailsPage.vue

@@ -35,12 +35,12 @@
                         <dic-select v-model="form.customerName" placeholder="客户" key="id" label="cname" res="records"
                             url="/blade-sales-part/corpsDesc/list?current=1&size=10&corpType=KH" :filterable="true"
                             :remote="true" dataName="cname" @selectChange="dicChange('customerName', $event)"
-                            :disabled="editButton || form.status == '已发货' || form.businessSource == '外部销售'"></dic-select>
+                            :disabled="editButton || form.status == '已发货' || form.businessSource == '外部销售' || form.goodsTotalShipNum > 0"></dic-select>
                     </tempalte>
                     <template slot-scope="{row,index}" slot="contacts">
                         <el-select v-model="form.contacts" placeholder="请选择" size="small" style="width:60%" clearable
                             filterable allow-create default-first-option @change="contactsChange($event)"
-                            :disabled="editButton || form.status == '已发货' || form.businessSource == '外部销售'">
+                            :disabled="editButton || form.status == '已发货' || form.businessSource == '外部销售' || form.goodsTotalShipNum > 0">
                             <el-option v-for="item in contactsOption" :key="item.id" :label="item.contacts"
                                 :value="item.contacts" />
                         </el-select>
@@ -66,17 +66,18 @@
                                     :disabled="!form.id || editButton || form.status == '已发货' || form.businessSource == '外部销售'"
                                     icon="el-icon-bottom" @click="excelDialogfun('code')">按Code导入
                                 </el-button>
+                                <el-button type="primary" plain size="small" @click="quickCopy">快捷复制</el-button>
                                 <el-popover placement="top" width="400" trigger="click" @show="inventoryShow2()">
                                     <avue-crud :data="inventoryList" :option="inventoryOption">
                                     </avue-crud>
                                     <el-button slot="reference" type="primary" plain size="small"
-                                        :disabled="selectionMultilist.length != 1">查看库存</el-button>
+                                        :disabled="selectionMultilist.length != 1 || form.businessSource == '外部销售'">查看库存</el-button>
                                 </el-popover>
                                 <el-button type="primary" plain size="small"
-                                    :disabled="selectionMultilist.length == 0 || editButton || form.status == '已发货'"
+                                    :disabled="selectionMultilist.length == 0 || editButton || form.status == '已发货' || form.businessSource == '外部销售'"
                                     @click="allClick('派发销售单')">派发销售单</el-button>
                                 <el-button type="danger" plain size="small" @click="allClick('撤销派发')"
-                                    :disabled="selectionMultilist.length == 0 || editButton || form.goodsTotalShipNum == 0">撤销派发</el-button>
+                                    :disabled="selectionMultilist.length == 0 || editButton || form.goodsTotalShipNum == 0 || form.businessSource == '外部销售'">撤销派发</el-button>
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <el-button type="danger" plain size="small" @click="batchDelete"
@@ -114,13 +115,15 @@
                                 <span v-else>{{ row.remarks }}</span>
                             </template>
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-                                <el-button v-if="!row.$cellEdit" :size="size" :disabled="editButton || row.sendNum > 0"
+                                <el-button v-if="!row.$cellEdit" :size="size"
+                                    :disabled="editButton || row.sendNum > 0 || form.businessSource == '外部销售'"
                                     :type="type" icon="el-icon-edit" @click="rowCell(row, index)">编辑
                                 </el-button>
                                 <el-button v-else :size="size" :disabled="editButton || row.sendNum > 0" :type="type"
                                     icon="el-icon-plus" @click="rowSave(row, index)">保存
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="editButton || row.sendNum > 0"
+                                <el-button icon="el-icon-delete" :size="size"
+                                    :disabled="editButton || row.sendNum > 0 || form.businessSource == '外部销售'"
                                     :type="type" @click="rowDelBox(row, index, 'orderItemsList')">删除
                                 </el-button>
                             </template>
@@ -1124,6 +1127,19 @@ export default {
         }
     },
     methods: {
+        // 快捷复制
+        quickCopy() {
+            let temp = document.createElement("textarea")
+            let txt = `${this.form.customerName} ${this.form.businesDate}`
+            for (let item of this.form.orderItemsList) {
+                txt += `\n${item.goodsName} ${item.goodsNum}`
+            }
+            document.body.appendChild(temp)
+            temp.value = txt
+            temp.select()
+            document.execCommand("copy")
+            document.body.removeChild(temp)
+        },
         confirmEditing() {
             this.editButton = false
             if (this.form.status != '已发货') {
@@ -1137,7 +1153,7 @@ export default {
                         }
                     })
                 }
-                if (this.form.businessSource == '内部销售') {
+                if (this.form.businessSource == '内部销售' && this.form.goodsTotalShipNum == 0) {
                     this.optionForm.disabled = false
                 }
 
@@ -1275,7 +1291,7 @@ export default {
                     });
                     revokeDistributeShareSales({ itemIds: ids.join(',') }).then(res => {
                         this.$message.success("操作成功");
-                        this.getDetail(this.form.id)
+                        this.getDetail(this.form.id, '撤销派发')
                     }).finally(() => {
                         loading.close();
                     });
@@ -1542,6 +1558,14 @@ export default {
                 if (res.data.data.status == '已发货') {
                     this.optionForm.disabled = true
                 }
+                if (res.data.data.goodsTotalShipNum > 0) {
+                    this.optionForm.disabled = true
+                }
+                if (type == '撤销派发') {
+                    if (res.data.data.goodsTotalShipNum == 0) {
+                        this.optionForm.disabled = false
+                    }
+                }
             }).finally(() => {
                 loading.close();
             })

src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -182,15 +182,15 @@
 
 
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
-                                <el-button v-if="mingxibaocun" :size="size" :disabled="disabled || isAdd" :type="type"
+                                <el-button v-if="mingxibaocun" :size="size" :disabled="disabled || isAdd|| form.billType == 1" :type="type"
                                     :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="hangeditBtn(row, index)">编辑
                                 </el-button>
-                                <el-button v-else :size="size" :disabled="disabled || isAdd" :type="type"
+                                <el-button v-else :size="size" :disabled="disabled || isAdd|| form.billType == 1" :type="type"
                                     :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'"
                                     @click="hangbaocun(row, index)">保存
                                 </el-button>
-                                <el-button icon="el-icon-delete" :size="size" :disabled="disabled || isDisabled"
+                                <el-button icon="el-icon-delete" :size="size" :disabled="disabled || isDisabled|| form.billType == 1"
                                     :type="type" @click="rowDelBox(row, index, 'orderItemsList')">删除
                                 </el-button>
                             </template>
@@ -1967,7 +1967,7 @@ export default {
             this.isAdd = false
             if (this.form.billType == 1) {
                 this.optionForm.column.forEach(its => {
-                    if (its.prop == 'customerName' || its.prop == 'businesDate' || its.prop == 'businessSource' || its.prop == 'returnsNumber' || its.prop == 'returnsAmount' || its.prop == 'srcOrdNo') {
+                    if (its.prop == 'customerName' || its.prop == 'businesDate' || its.prop == 'businessSource' || its.prop == 'returnsNumber' || its.prop == 'returnsAmount' || its.prop == 'srcOrdNo'|| its.prop == 'phone'|| its.prop == 'recAddress'|| its.prop == 'storageId'|| its.prop == 'receivableType') {
                         this.$set(its, 'disabled', true)
                         this.isSaveBtn = false;
                         this.isDisabledTask = false;

src/views/tirePartsMall/statisticAnalysis/outboundStatistics/index.vue

@@ -213,6 +213,7 @@ export default {
         //点击搜索按钮触发
         searchChange(params, done) {
             this.page.currentPage = 1;
+            this.query = params
             this.onLoad(this.page, params);
             done();
         },
@@ -231,6 +232,7 @@ export default {
             obj = {
                 ...Object.assign(params, this.query),
             }
+            console.log(obj)
             saleFinancingDetail(page.currentPage, page.pageSize, obj).then(res => {
                 this.dataList = res.data.data.records;
                 this.page.total = res.data.data.total;