瀏覽代碼

提交bug

web100 2 年之前
父節點
當前提交
90b5290f79

+ 7 - 6
src/views/tirePartsMall/basicData/commodityInformation/detailsPage.vue

@@ -41,7 +41,7 @@
                     </template>
                     <template slot="whether" slot-scope="{disabled}">
                         <!--<el-switch v-model="form.whether" active-text="是" inactive-text="否" active-value="1" inactive-value="0" @change="whetherChange"/>-->
-                        <el-switch v-model="form.whether" :disabled="disabled" active-text="是" inactive-text="否"
+                        <el-switch v-model="form.whether" :disabled="disabled " active-text="是" inactive-text="否"
                             active-value="1" inactive-value="0" />
                     </template>
                     <template slot="explosionProof" slot-scope="{disabled}">
@@ -181,7 +181,7 @@ export default {
                         }]
                     },
                     {
-                        label: "商品编码",
+                        label: "轮胎编码",
                         prop: "code",
                         span: 8,
                         rules: [{
@@ -243,7 +243,7 @@ export default {
                         span: 8,
                     },
                     {
-                        label: "商品描述",
+                        label: "轮胎描述",
                         prop: "goodsDescription",
                         span: 8,
                     },
@@ -698,9 +698,10 @@ export default {
                         this.form = res.data.data;
                         // this.data = res.data.data.stockGoodsList;
                         this.filesList = res.data.data.goodsFilesList;
-                        setTimeout(() => {
-                            this.backToList()
-                        }, 1000);
+                        this.getDetail(this.detailData.id);
+                        // setTimeout(() => {
+                        //     this.backToList()
+                        // }, 1000);
                     }).finally(() => {
                         this.loadingBtn = false;
                     });

+ 4 - 4
src/views/tirePartsMall/basicData/commodityInformation/js/optionList.js

@@ -18,19 +18,19 @@ export const option = {
   searchIndex: 2,
   column: [
     {
-      label: "商品名称",
+      label: "轮胎名称",
       prop: "cname",
       search: true,
       overHidden: true,
     },
     {
-      label: "商品编码",
+      label: "轮胎编码",
       prop: "code",
       overHidden: true,
       search: true
     },
     {
-      label: "商品分类",
+      label: "轮胎分类",
       prop: "goodsTypeName",
       overHidden: true,
     },
@@ -79,7 +79,7 @@ export const option = {
       }],
     },
     {
-      label: "商品描述",
+      label: "轮胎描述",
       prop: "goodsDescription",
       search: false,
       overHidden: true,

+ 3 - 3
src/views/tirePartsMall/basicData/listingManagement/commodity.json

@@ -21,7 +21,7 @@
     "dialogClickModal": false,
     "column": [
         {
-            "label": "商品名称",
+            "label": "轮胎名称",
             "prop": "cname",
             "slot": true,
             "search": true,
@@ -36,7 +36,7 @@
             ]
           },
       {
-        "label": "商品编码",
+        "label": "轮胎编码",
         "prop": "code",
         "search": true,
         "width": 100,
@@ -56,7 +56,7 @@
         "overHidden": true
       },
       {
-        "label": "商品类别",
+        "label": "轮胎类别",
         "prop": "goodsTypeName",
         "hide": true,
         "addDisabled": false,

+ 5 - 3
src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -14,8 +14,10 @@
             @resetColumn="resetColumnTwo('crud', 'option', 'optionList', 273)"
             @saveColumn="saveColumnTwo('crud', 'option', 'optionList', 273)" :page.sync="page">
             <template slot="filesListForm">
+              <span style="font-size: 12px;">(图片文件像素推荐700X750,有且只允许有一张主图,其余均为副图)</span>
               <c-upload :data="form.filesList" display basic deleteUrl="/api/blade-sales-part/productLaunchFiles/remove"
                 :enumerationValue="160" />
+
             </template>
             <template slot="detailsTextForm">
               <avue-ueditor v-model="form.detailsText" :options="optionsUeditor"></avue-ueditor>
@@ -246,7 +248,7 @@ export default {
         highlightCurrentRow: true,
         dialogWidth: "90%",
         column: [{
-          label: '商品名称',
+          label: '轮胎名称',
           prop: 'cname',
           search: true,
           disabled: true,
@@ -334,14 +336,14 @@ export default {
           },
           dicUrl: '/api/blade-system/dept/deptList'
         }, {
-          label: "详情附件",
+          label: "轮胎图片",
           prop: "filesList",
           hide: true,
           showColumn: false,
           overHidden: true,
           span: 24,
         }, {
-          label: "商品详情",
+          label: "轮胎详情",
           prop: "detailsText",
           hide: true,
           span: 24,

+ 2 - 2
src/views/tirePartsMall/basicData/shareListing/index.vue

@@ -160,7 +160,7 @@ export default {
         highlightCurrentRow: true,
         dialogWidth: "70%",
         column: [{
-          label: '商品名称',
+          label: '轮胎名称',
           prop: 'cname',
           search: true,
           disabled: true,
@@ -255,7 +255,7 @@ export default {
           overHidden: true,
           span: 24,
         }, {
-          label: "商品详情",
+          label: "轮胎详情",
           prop: "detailsText",
           hide: true,
           span: 24,

+ 3 - 3
src/views/tirePartsMall/inventory/index.vue

@@ -82,12 +82,12 @@ export default {
             },
         ],
         column: [{
-          label: '商品编码',
+          label: '轮胎编码',
           prop: "code",
           search: true,
           overHidden: true,
         },{
-          label: '商品名称',
+          label: '轮胎名称',
           prop: "cname",
           search: true,
           overHidden: true,
@@ -116,7 +116,7 @@ export default {
           overHidden: true,
           width:100
         },{
-          label: '商品描述',
+          label: '轮胎描述',
           prop: "productDescription",
           overHidden: true,
           width:100

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

@@ -210,7 +210,7 @@ export default {
                         }]
                     },
                     {
-                        label: "商品数量",
+                        label: "轮胎数量",
                         prop: "goodsTotalNum",
                         search: false,
                         overHidden: true,
@@ -278,7 +278,7 @@ export default {
                 disabled:false,
                 dialogWidth: "80%",
                 column: [{
-                    label: '商品名称',
+                    label: '轮胎名称',
                     prop: 'goodsId',
                     width: 200,
                     overHidden: true,
@@ -319,7 +319,7 @@ export default {
                     prop: "pattern",
                     overHidden: true
                 }, {
-                    label: "商品描述",
+                    label: "轮胎描述",
                     prop: "goodsDescription",
                     overHidden: true
                 }, {

+ 1 - 1
src/views/tirePartsMall/purchasingManagement/warehouseEntryOrder/index.vue

@@ -146,7 +146,7 @@ export default {
           //   console.log(this.$refs.crud.DIC.storageName[0].salesCompanyId);
           // }
         }, {
-          label: "商品数量",
+          label: "轮胎数量",
           prop: "goodsTotalNum",
           search: false,
           overHidden: true,

+ 4 - 4
src/views/tirePartsMall/salesManagement/outboundWorkOrder/detailsPage.vue

@@ -174,7 +174,7 @@ export default {
           disabled: true
         },
         {
-          label: '商品数量',
+          label: '轮胎数量',
           disabled: false,
           prop: "goodsTotalNum",
           disabled: true,
@@ -214,12 +214,12 @@ export default {
         dialogTop: 25,
         dialogWidth: "80%",
         column: [{
-          label: '商品编码',
+          label: '轮胎编码',
           disabled: true,
           prop: 'goodsNo',
           width: 100
         }, {
-          label: '商品名称',
+          label: '轮胎名称',
           prop: 'goodsId',
           disabled: true,
           width: 200,
@@ -253,7 +253,7 @@ export default {
           disabled: true,
           width: 100
         }, {
-          label: '商品描述',
+          label: '轮胎描述',
           prop: 'goodsDescription',
           disabled: true,
         }, {

+ 1 - 1
src/views/tirePartsMall/salesManagement/outboundWorkOrder/index.vue

@@ -135,7 +135,7 @@ export default {
         //   overHidden: true,
         // }
         , {
-          label: '商品数量',
+          label: '轮胎数量',
           prop: "goodsTotalNum",
           overHidden: true,
         }, {

+ 82 - 41
src/views/tirePartsMall/salesManagement/saleOrder/detailsPage.vue

@@ -14,7 +14,7 @@
                     @click="editCustomer">保 存
                 </el-button>
                 <el-button class="el-button--small-yh" style="margin-left: 6px;" :type="buttonColor" size="small"
-                    v-if="form.generateTask !== '已生成'" :disabled="isDisabledTask" @click="generateOutbound">
+                     :disabled="isDisabledTask" @click="generateOutbound">
                     {{ buttonText }}
                 </el-button>
 
@@ -50,7 +50,7 @@
                 <avue-form :option="optionForm" v-model="form" ref="form">
                     <template slot-scope="{row,index}" slot="contacts">
                         <el-select v-model="form.contacts" placeholder="请选择" size="small" style="width:60%" filterable
-                            @change="contactsChange($event)">
+                            @change="contactsChange($event)" :disabled = isContacts>
                             <el-option v-for="item in contactsOption" :key="item.id" :label="item.contacts"
                                 :value="item.contacts" />
                         </el-select>
@@ -67,7 +67,7 @@
                                 <el-button type="primary" icon="el-icon-printer" size="small"
                                     @click="handlePrint">打印</el-button>
                             </template>
-                            <template slot="goodsId" slot-scope="{ row, index }">
+                            <!-- <template slot="goodsId" slot-scope="{ row, index }">
                                 <span  style="display:flex">
                                     <el-select v-model="row.goodsId" placeholder="请选择" size="small" filterable
                                         style="width:60%" >
@@ -77,7 +77,7 @@
                                     </el-select>
                                     <el-button icon="el-icon-search" size="small" @click="rePick(row, index)"></el-button>
                                 </span>
-                            </template>
+                            </template> -->
                             <template slot-scope="{type,size,row,index,disabled}" slot="menu">
                                 <el-button :size="size" :disabled="disabled" :type="type"
                                     :icon="row.$cellEdit ? 'el-icon-plus' : 'el-icon-edit'" @click="editBtn(row, index)">编辑
@@ -147,6 +147,7 @@ import checkSchedule from "@/components/check/checkSchedule";
 import check from "@/components/check/check";
 import { getList } from "@/api/paymentManagement/paymentRecord"
 import TicketDistribution from "../../../oceanShipping/maritimeExport/components/ticketDistribution.vue";
+import M from "minimatch";
 export default {
     name: "detailsPage",
     data() {
@@ -155,8 +156,9 @@ export default {
             dataList: [],
             dicUrlWithCustomId: '',
             isDisabled: false,
-            isDisabledTask: true,
+            isDisabledTask: false,
             contactsOption: [],
+            isContacts:false,
             checkData: {},
             buttonText: '生成任务',
             buttonColor: 'success', // 初始颜色为success
@@ -196,7 +198,6 @@ export default {
                         console.log('this.onLoad.id', this.onLoad.id);
 
                         if (!this.form.id) {
-                            console.log(3);
                             this.$set(this.optionContactsBack, "addBtn", true)
                             // this['optionContacts'] = this['optionContactsBack'];
                             // this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
@@ -406,22 +407,22 @@ export default {
                 //   decimals: 2
                 // }],
                 column: [{
-                    label: '商品名称',
+                    label: '轮胎名称',
                     prop: 'goodsId',
                     width: 200,
                     disabled: false,
                     remote: true,
                     overHidden: true,
                     type: 'select',
-                    // props: {
-                    //     label: 'cname',
-                    //     value: 'id'
-                    // },
+                    props: {
+                        label: 'cname',
+                        value: 'id'
+                    },
                     // dicUrl: '/api/blade-sales-part/goodsDesc/goodsListAll?cname={{key}}'
-                    // dicUrl: /api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}&customId=${this.dicUrlWithCustomId}
+                    dicUrl: []
                     // dicUrl: "/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}"
                 }, {
-                    label: '商品编码',
+                    label: '轮胎编码',
                     prop: 'goodsNo',
                     overHidden: true,
                     disabled: false,
@@ -451,7 +452,7 @@ export default {
                     disabled: false,
                     width: 100
                 }, {
-                    label: '商品描述',
+                    label: '轮胎描述',
                     prop: 'goodsDescription',
                     disabled: false,
                     overHidden: true,
@@ -642,15 +643,15 @@ export default {
     },
     async created() {
         this.findObject(this.optionContactsBack.column, "goodsId").change = ({ value, column }) => {
-
             if (this.formContacts.goodsId !== value) {
-                goodsDetail({ id: value }).then(res => {
+                goodsDetail({ id: value,customId:this.dicUrlWithCustomId }).then(res => {
                     this.formContacts.goodsNo = res.data.data.code
                     this.formContacts.brandId = res.data.data.brandId
                     this.formContacts.propertyName = res.data.data.specificationAndModel
                     this.formContacts.pattern = res.data.data.brandItem
                     this.formContacts.goodsDescription = res.data.data.goodsDescription
                     this.formContacts.units = res.data.data.unit
+                    this.formContacts.price = res.data.data.price
                     if (res.data.data.whether == 0) {
                         this.findObject(this.optionContactsBack.column, "dot").disabled = true
                     } else {
@@ -695,11 +696,10 @@ export default {
         this.optionOutboundRecords = await this.getColumnData(this.getColumnName(269.3), this.optionOutboundRecordsBack);
         this.key++
         if (this.onLoad.id && this.detailData.id) {
-            console.log(1);
             this.$set(this.optionForm, 'disabled', true)
             this.$set(this.optionContactsBack, 'disabled', true)
+            this.isContacts = true
             this.isDisabled = true
-
             this.refresh(this.onLoad.id, true)
         } else if (this.onLoad.id) {
             console.log(2);
@@ -715,23 +715,55 @@ export default {
             this.form.businessSource = '内部销售'
         }
         console.log('this.detailData.status', this.detailData.status);
-        if (this.detailData.status == 1) {
-            this.isExamineBtn = false;
-        }
-        goodsListXs(this.dicUrlWithCustomId).then(res=>{
-            console.log(res);
-            this.goodsIdoptions = res.data
-        })
+        // if (this.detailData.status == 1) {
+        //     this.isExamineBtn = false;
+        // }
+        // goodsListXs(this.dicUrlWithCustomId).then(res=>{
+        //     console.log(res);
+        //     this.goodsIdoptions = res.data
+        // })
     },
     watch:{
         dicUrlWithCustomId(){
-            console.log(23432);
-            goodsListXs(this.dicUrlWithCustomId).then(res=>{
-            console.log(res);
-            this.goodsIdoptions = res.data
-        })
-            // this.findObject(this.optionContactsBack.column, "goodsId").dicUrl = `/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}&customId=${this.dicUrlWithCustomId}`
+        //     console.log(23432);
+        //     goodsListXs(this.dicUrlWithCustomId).then(res=>{
+        //     console.log(res);
+        //     this.goodsIdoptions = res.data
+        // })
+            this.findObject(this.optionContactsBack.column, "goodsId").dicUrl = `/api/blade-sales-part/goodsDesc/goodsListXs?cname={{key}}&customId=${this.dicUrlWithCustomId}`
+
+     
+        },
+        $route(to, from) {
+        if (this.onLoad.id && this.detailData.id) {
+            this.$set(this.optionForm, 'disabled', true)
+            this.$set(this.optionContactsBack, 'disabled', true)
+            this.isContacts = true
+            this.isDisabled = true
+            this.refresh(this.onLoad.id, true)
+        } else if (this.onLoad.id) {
+            console.log(2);
+            this.refresh(this.onLoad.id, true)
         }
+        if (!this.form.id) {
+            console.log(3);
+            this.$set(this.optionContactsBack, "addBtn", false)
+            this['optionContacts'] = this['optionContactsBack'];
+            this.delColumnData(this.getColumnName('269.1'), this['optionContactsBack']);
+        }
+        if (!this.detailData.id) {
+            this.form.businessSource = '内部销售'
+        }
+        console.log('this.detailData.status', this.detailData.status);
+        // if (this.detailData.status == 1) {
+        //     this.isExamineBtn = false;
+        // }
+        if(to.name == '销售订单'){
+            console.log('销售订单');
+            this.isExamineBtn = false;
+
+        }
+    }
     },
     methods: {
         editBtn(row, index) {
@@ -807,7 +839,7 @@ export default {
                     this.$set(item, 'disabled', false)
                 })
                 this.optionContactsBack.column.forEach(item => {
-                    if (item.label === '规格型号' || item.label === '花纹' || item.label === '品牌' || item.label === '物料编码' || item.label === '单位' || item.label === '商品描述') {
+                    if (item.label === '规格型号' || item.label === '花纹' || item.label === '品牌' || item.label === '物料编码' || item.label === '单位' || item.label === '轮胎描述') {
                         item.disabled = true;
                     }
                 })
@@ -819,7 +851,10 @@ export default {
             // this.$set(this.form.orderItemsList,'goodsNum',66)
         },
         generateOutbound() {
-            if (this.buttonText === '生成任务') {
+            if(!this.form.id){
+                this.$message.error('请先保存')
+            }else{
+                if (this.buttonText === '生成任务') {
                 // 将按钮文本更改为"撤销任务"
                 this.buttonText = '撤销任务';
                 // 将按钮颜色更改为对应的颜色
@@ -872,6 +907,7 @@ export default {
                 })
             }
 
+            }
         },
         //联系人change
         contactsChange(e) {
@@ -932,20 +968,25 @@ export default {
                     this.isApplySettlement = false;
                 }
 
-                if (this.form.status == '退款中' || this.form.status == '已取消') {
-                    console.log(2);
+                if (this.form.status == '退款中') {
                     this.isConfirmRefundBtn = false;
                 }
-
-                if (this.form.status == '退款请核') {
-                    console.log(3);
-                    this.isExamineBtn = false;
+                if(this.form.status == '已取消'){
+                    this.isConfirmRefundBtn = true;
                 }
 
-                console.log(this.form.status == '退款请核' || this.form.status == '退款中');
+                // if (this.form.status == '退款请核') {
+
+                //     this.isExamineBtn = false;
+                // }
+                if(this.form.generateTask == '已生成'){
+                    this.buttonText = '撤销任务';
+                    this.isDisabledTask = false;
+                    this.buttonColor= 'warning'
+
+                }
 
                 if (this.form.status == '退款请核' || this.form.status == '退款中') {
-                    console.log(4);
                     this.isRevocationRequest = false;
                 }
                 this.form.orderItemsList.forEach((items) => {