Qukatie 11 miesięcy temu
rodzic
commit
2f29e5de5d

+ 6 - 6
src/views/iosBasicData/AirtransportExport/bills/billsDetails.vue

@@ -1341,12 +1341,12 @@ export default {
                     if (!verifyEnglish(this.form.commodityDescr)) {
                         msgsList.push('货描')
                     }
-                    if (!verifyEnglish(this.form.remarks)) {
-                        msgsList.push('备注')
-                    }
-                    if (!verifyEnglish(this.form.cyRemarks)) {
-                        msgsList.push('场站备注')
-                    }
+                    // if (!verifyEnglish(this.form.remarks)) {
+                    //     msgsList.push('备注')
+                    // }
+                    // if (!verifyEnglish(this.form.cyRemarks)) {
+                    //     msgsList.push('场站备注')
+                    // }
                     if (msgsList.length > 0) {
                         this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
                         return;

+ 6 - 6
src/views/iosBasicData/AirtransportImport/bills/billsDetails.vue

@@ -1336,12 +1336,12 @@ export default {
                     if (!verifyEnglish(this.form.commodityDescr)) {
                         msgsList.push('货描')
                     }
-                    if (!verifyEnglish(this.form.remarks)) {
-                        msgsList.push('备注')
-                    }
-                    if (!verifyEnglish(this.form.cyRemarks)) {
-                        msgsList.push('场站备注')
-                    }
+                    // if (!verifyEnglish(this.form.remarks)) {
+                    //     msgsList.push('备注')
+                    // }
+                    // if (!verifyEnglish(this.form.cyRemarks)) {
+                    //     msgsList.push('场站备注')
+                    // }
                     if (msgsList.length > 0) {
                         this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
                         return;

+ 6 - 6
src/views/iosBasicData/OceanFreightImport/bills/billsDetails.vue

@@ -1359,12 +1359,12 @@ export default {
                     if (!verifyEnglish(this.form.commodityDescr)) {
                         msgsList.push('货描')
                     }
-                    if (!verifyEnglish(this.form.remarks)) {
-                        msgsList.push('备注')
-                    }
-                    if (!verifyEnglish(this.form.cyRemarks)) {
-                        msgsList.push('场站备注')
-                    }
+                    // if (!verifyEnglish(this.form.remarks)) {
+                    //     msgsList.push('备注')
+                    // }
+                    // if (!verifyEnglish(this.form.cyRemarks)) {
+                    //     msgsList.push('场站备注')
+                    // }
                     if (msgsList.length > 0) {
                         this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
                         return;

+ 12 - 13
src/views/iosBasicData/SeafreightExportF/bills/billsDetails.vue

@@ -1542,22 +1542,21 @@ export default {
                     if (!verifyEnglish(this.form.commodityDescr)) {
                         msgsList.push('货描')
                     }
-                    if (!verifyEnglish(this.form.bookingRemarks)) {
-                        console.log(this.form.bookingRemarks,verifyEnglish(this.form.bookingRemarks),1111111)
-                        msgsList.push('订舱备注')
-                    }
-                    if (!verifyEnglish(this.form.siRemarks)) {
-                        msgsList.push('SI备注')
-                    }
+                    // if (!verifyEnglish(this.form.bookingRemarks)) {
+                    //     msgsList.push('订舱备注')
+                    // }
+                    // if (!verifyEnglish(this.form.siRemarks)) {
+                    //     msgsList.push('SI备注')
+                    // }
                     if (!verifyEnglish(this.form.forwarding)) {
                         msgsList.push('FORWARDING')
                     }
-                    if (!verifyEnglish(this.form.remarks)) {
-                        msgsList.push('备注')
-                    }
-                    if (!verifyEnglish(this.form.cyRemarks)) {
-                        msgsList.push('场站备注')
-                    }
+                    // if (!verifyEnglish(this.form.remarks)) {
+                    //     msgsList.push('备注')
+                    // }
+                    // if (!verifyEnglish(this.form.cyRemarks)) {
+                    //     msgsList.push('场站备注')
+                    // }
                     if (msgsList .length > 0) {
                         this.$message.error(`请正确输入${msgsList.join(",")}的英文和英文符号`);
                         return;

+ 3 - 6
src/views/tirePartsMall/inventory/config/detail.json

@@ -17,17 +17,14 @@
     "tip": false,
     "expand": false,
     "expandWidth": 38,
+    "summaryText": "合计",
     "sumColumnList": [
         {
-            "name": "addQuantity",
+            "name": "addSendTotalNum",
             "type": "sum"
         },
         {
-            "name": "subQuantity",
-            "type": "sum"
-        },
-        {
-            "name": "totalQuantity",
+            "name": "subSendTotalNum",
             "type": "sum"
         }
     ],

+ 2 - 1
src/views/tirePartsMall/purchasingManagement/financingProcurement/detailsPage.vue

@@ -74,7 +74,8 @@
                     <tempalte slot="fundingPartyName" slot-scope="{ row }">
                         <dic-select v-model="form.fundingPartyName" placeholder="资金方" key="id" label="cname" res="records"
                             url="/blade-sales-part/corpsDesc/list?corpType=GYS" :filterable="true" :remote="true"
-                            dataName="cname" @selectChange="dicChange('fundingPartyName', $event)" :disabled="editButton"></dic-select>
+                            dataName="cname" @selectChange="dicChange('fundingPartyName', $event)"
+                            :disabled="editButton"></dic-select>
                     </tempalte>
                 </avue-form>
             </trade-card>

+ 71 - 71
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/detailsPage.vue

@@ -48,7 +48,7 @@
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
                                 <el-button :size="size" :disabled="disabled || isEdit" :type="type"
                                     :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="rowEdit(row, index)">
-                                    {{row.$cellEdit?'保存':'编辑'}}
+                                    {{ row.$cellEdit ? '保存' : '编辑' }}
                                 </el-button>
                                 <el-button icon="el-icon-delete" :size="size"
                                     :disabled="disabled || form.statusName == '已入库' || isEdit || isEdits" :type="type"
@@ -63,8 +63,8 @@
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                                 <el-button type="danger" plain size="small"
-                                           :disabled="disabled || form.statusName == '已入库' || isEdit || isEdits"
-                                           @click="batchDelete" >一键删除</el-button>
+                                    :disabled="disabled || form.statusName == '已入库' || isEdit || isEdits"
+                                    @click="batchDelete">一键删除</el-button>
                             </template>
                         </avue-crud>
                     </el-tab-pane>
@@ -88,8 +88,8 @@
 
             <containerTitle title="上传附件"></containerTitle>
             <c-upload v-loading="loadingBtn" typeUpload="LT" :disabled="isEdit"
-                      deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="filesList" display
-                      :enumerationValue="35.1"></c-upload>
+                deleteUrl="/api/trade-purchase/woodHarvestingCloud/removeByFileId" :data="filesList" display
+                :enumerationValue="35.1"></c-upload>
 
         </div>
         <el-dialog title="导入明细" append-to-body :visible.sync="excelBox" v-if="excelBox" width="555px"
@@ -126,14 +126,14 @@ import { dateFormat } from "@/util/date";
 import { getToken } from "@/util/auth";
 import { getMenu } from "@/api/system/menu";
 import reportDialog from "@/components/report-dialog/main";
-import {corpsDescListAll} from "@/api/tirePartsMall/salesManagement/saleOrder";
+import { corpsDescListAll } from "@/api/tirePartsMall/salesManagement/saleOrder";
 export default {
     name: "detailsPage",
     data() {
         return {
             // 上传附件的需要参数
-            loadingBtn:false,
-            filesList:[],
+            loadingBtn: false,
+            filesList: [],
 
             switchDialog: false,
             isEdit: false,
@@ -201,10 +201,10 @@ export default {
                                 trigger: "blur"
                             }
                         ],
-                        change:({ value, column }) => {
+                        change: ({ value, column }) => {
                             if (this.form.billno.indexOf('TK') != -1) {
                                 this.corpsDescListAllfun('KH')
-                            }else {
+                            } else {
                                 this.corpsDescListAllfun('GYS')
                             }
                         }
@@ -328,14 +328,14 @@ export default {
                 menuWidth: 160,
                 stripe: true,
                 span: 8,
-                addRowBtn:false,
+                addRowBtn: false,
                 menu: true, // 是否员操作栏
                 dialogTop: 25,
                 dialogWidth: "80%",
                 showSummary: true,
-                saveBtn:false, // 表格弹窗保存按钮
-                cellBtn:false, // 行编辑
-                selection:true,
+                saveBtn: false, // 表格弹窗保存按钮
+                cellBtn: false, // 行编辑
+                selection: true,
                 sumColumnList: [
                     {
                         name: 'sendNum',
@@ -352,14 +352,14 @@ export default {
                     overHidden: true,
                     disabled: false,
                     filterable: true,
-                    hide:true,
+                    hide: true,
                     type: 'select',
                     props: {
                         label: 'cname',
                         value: 'id'
                     },
                     dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll'
-                },{
+                }, {
                     label: '商品名称',
                     prop: 'goodsName',
                     width: 200,
@@ -390,7 +390,7 @@ export default {
                 {
                     label: "到货数量",
                     prop: "sendNum",
-                    width:100,
+                    width: 100,
                     cell: true,
                     disabled: false,
                     overHidden: true,
@@ -411,8 +411,8 @@ export default {
                     }]
                 }, {
                     label: "批次号",
-                        cell:true,
-                        width:120,
+                    cell: true,
+                    width: 120,
                     prop: "dot",
                     type: "select",
                     disabled: false,
@@ -430,25 +430,25 @@ export default {
                     overHidden: true,
                     disabled: false,
                     width: 140
-                // }, {
-                //     label: "品牌",
-                //     prop: 'brandId',
-                //     width: 100,
-                //     overHidden: true,
-                //     disabled: false,
-                //     type: 'select',
-                //     props: {
-                //         label: 'cname',
-                //         value: 'id'
-                //     },
-                //     dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
-                // }, {
-                  }, {
+                    // }, {
+                    //     label: "品牌",
+                    //     prop: 'brandId',
+                    //     width: 100,
+                    //     overHidden: true,
+                    //     disabled: false,
+                    //     type: 'select',
+                    //     props: {
+                    //         label: 'cname',
+                    //         value: 'id'
+                    //     },
+                    //     dicUrl: '/api/blade-sales-part/brandDesc/listAll?type=PP'
+                    // }, {
+                }, {
                     label: "品牌",
                     prop: "brandName",
                     disabled: false,
                     overHidden: true
-                  }, {
+                }, {
                     label: "规格型号",
                     prop: "propertyName",
                     overHidden: true,
@@ -485,15 +485,15 @@ export default {
                     ovrHidden: true,
                 }, {
                     label: "备注",
-                        cell:true,
+                    cell: true,
                     prop: "remarks",
-                        width:150,
+                    width: 150,
                     span: 16,
                     disabled: false,
                     overHidde: true
                 }]
             },
-            selectionMultilist:[], // 多选数据
+            selectionMultilist: [], // 多选数据
             optionPaymentDetails: {},
             optionPaymentDetailsBack: {
                 align: "center",
@@ -697,7 +697,7 @@ export default {
     components: {
         reportDialog
     },
-    activated(){
+    activated() {
         this.$store.commit("DOMIO_IN_DETAIL");
     },
     methods: {
@@ -733,7 +733,7 @@ export default {
         //撤销
         revoke() {
             this.$refs["form"].validate((valid, done) => {
-                console.log(valid,'valid')
+                console.log(valid, 'valid')
                 done();
                 if (valid) {
                     const loading = this.$loading({
@@ -744,7 +744,7 @@ export default {
                     });
                     revoke({
                         ...this.form,
-                        bizTypeName: "SHGD"
+                        bizTypeName: this.form.id ? this.form.bizTypeName : "SHGD"
                     }).then(res => {
                         this.$message.success("撤销成功");
                         this.refresh(res.data.data.id)
@@ -838,11 +838,11 @@ export default {
                     this.form.customerName = this.form.$customerId
                     submit({
                         ...this.form,
-                        bizTypeName: "SHGD"
+                        bizTypeName: this.form.id ? this.form.bizTypeName : "SHGD"
                     }).then(res => {
                         warehousingComplete({
                             ...this.form,
-                            bizTypeName: "SHGD"
+                            bizTypeName: this.form.id ? this.form.bizTypeName : "SHGD"
                         }).then(res => {
                             this.refresh(res.data.data.id)
                             this.$set(this.optionForm, 'disabled', true)
@@ -872,13 +872,13 @@ export default {
                         background: 'rgba(255,255,255,0.7)'
                     });
                     this.form.customerName = this.form.$customerId
-                    this.form.shipItemsList.map(item=>{
+                    this.form.shipItemsList.map(item => {
                         item.$cellEdit = false
                     })
                     submit({
                         ...this.form,
-                        bizTypeName: "SHGD",
-                        filesList:this.filesList
+                        bizTypeName: this.form.id ? this.form.bizTypeName : "SHGD",
+                        filesList: this.filesList
                     }).then(res => {
                         this.$message.success("保存成功");
                         this.refresh(res.data.data.id);
@@ -917,17 +917,17 @@ export default {
             }
         },
         // 获取业务对象
-        corpsDescListAllfun(corpType){
-            corpsDescListAll({corpType}).then(res=>{
+        corpsDescListAllfun(corpType) {
+            corpsDescListAll({ corpType }).then(res => {
                 this.optionForm.column[0].dicData = res.data.data
             })
         },
         //编辑
         rowEdit(row, index) {
             if (row.$cellEdit) {
-                this.$set(row,'$cellEdit',false)
-            }else {
-                this.$set(row,'$cellEdit',true)
+                this.$set(row, '$cellEdit', false)
+            } else {
+                this.$set(row, '$cellEdit', true)
             }
             // this.confirmEditing()
             dotList({
@@ -937,7 +937,7 @@ export default {
                 this.findObject(this.optionContactsBack.column, "dot").dicData = res.data.data
                 // console.log(this.dicData)
             })
-            console.log(this.optionContacts,802)
+            console.log(this.optionContacts, 802)
             // this.$refs.formContacts.rowEdit(row, index)
         },
         rowDelBox(row, index) {
@@ -959,11 +959,11 @@ export default {
             );
         },
         // 明细信息多选
-        selectionContacts(list){
+        selectionContacts(list) {
             this.selectionMultilist = list
         },
         // 一键删除
-        batchDelete(){
+        batchDelete() {
             if (this.selectionMultilist.length == 0) {
                 return this.$message.warning('请选择要删除的数据')
             }
@@ -971,26 +971,26 @@ export default {
                 confirmButtonText: "确定",
                 cancelButtonText: "取消",
                 type: "warning"
-            }).then(()=>{
-                    let multiList = this.selectionMultilist
-                    let arr = this.form.shipItemsList
-                    // 获取有id 的数据
-                    const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
-                    let arrIds = itemsWithId.map(item=>item.id) // 获取id 数据
-                    // 把选中的删除掉
-                    multiList.forEach((item)=>{
-                        for (let index in arr) {
-                            if (JSON.stringify(item) == JSON.stringify(arr[index])) {
-                                arr.splice(Number(index),1)
-                            }
+            }).then(() => {
+                let multiList = this.selectionMultilist
+                let arr = this.form.shipItemsList
+                // 获取有id 的数据
+                const itemsWithId = multiList.filter(item => item.hasOwnProperty('id'));
+                let arrIds = itemsWithId.map(item => item.id) // 获取id 数据
+                // 把选中的删除掉
+                multiList.forEach((item) => {
+                    for (let index in arr) {
+                        if (JSON.stringify(item) == JSON.stringify(arr[index])) {
+                            arr.splice(Number(index), 1)
                         }
-                    })
-                    // 有id 的处理
-                    if(itemsWithId.length != 0) {
-                        tradingBox(arrIds.join(',')).then(res => {
-                            this.$message.success("操作成功!");
-                        });
                     }
+                })
+                // 有id 的处理
+                if (itemsWithId.length != 0) {
+                    tradingBox(arrIds.join(',')).then(res => {
+                        this.$message.success("操作成功!");
+                    });
+                }
             })
         },
         rowSave(form, done, loading) {

+ 10 - 4
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -858,7 +858,15 @@ export default {
                     },
                     dicUrl: "/api/blade-sales-part/stockDesc/dotList",
                     overHidden: true,
-                }, {
+                },
+                // {
+                //     label: '单号',
+                //     prop: 'poNo',
+                //     overHidden: true,
+                //     disabled: false,
+                //     width: 100
+                // },
+                {
                     label: '商品编码',
                     prop: 'goodsNo',
                     overHidden: true,
@@ -1545,6 +1553,7 @@ export default {
                     pattern: item.brandItem,
                     goodsDescription: item.goodsDescription,
                     dot: item.dot,
+                    // poNo: item.poNo,
                     whether: item.whether,
                     units: item.unit,
                     // 小计
@@ -1666,10 +1675,7 @@ export default {
                 return
             }
         },
-
-
         editBtn(row, index) {
-
             this.confirmEditing()
             this.$refs.formContacts.rowEdit(row, index);
             dotList({

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

@@ -135,7 +135,7 @@
                     </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"
+                            url="/blade-los/bcorps/listByType?corpTypeName=船代" :filterable="true" :remote="true"
                             dataName="cnName" @selectChange="dicChange('bookingAgentCnName', $event)"
                             :disabled="editDisabled" :searchShow="true"></dic-select>
                     </tempalte>