孤鹤 2 anos atrás
pai
commit
cc0c2e25ab

+ 4 - 1
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 || isWhether" active-text="是" inactive-text="否"
                             active-value="1" inactive-value="0" />
                     </template>
                     <template slot="explosionProof" slot-scope="{disabled}">
@@ -111,6 +111,7 @@ export default {
             loadingBtn: false,
             goodsTypeVisible: false,
             storageVisible: false,
+            isWhether:false,
             form: {},
             form2: {},
             form3: {},
@@ -657,11 +658,13 @@ export default {
                     for (let item of this.option.column) {
                         this.$set(item,'disabled',true)
                     }
+                    this.isWhether = true
                 } else if (this.form.modifiable == 1) {
                     console.log(this.form.modifiable, '1');
                     for (let item of this.option.column) {
                         item.disabled = false
                     }
+                    this.isWhether = false
                 }
                 if(this.form.enableOrNot == 1){
                     for (let item of this.option.column) {

+ 3 - 1
src/views/tirePartsMall/basicData/commodityInformation/index.vue

@@ -5,8 +5,10 @@
         <el-col :span="4">
           <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" style="height:82vh;">
             <template slot="addBtn">
-              <i class="el-icon-setting" @click="goodsTypeVisible = true" title="新增分类"
+              <el-tooltip class="item" effect="dark" content="新建分类" placement="top">
+              <i class="el-icon-setting" @click="goodsTypeVisible = true"
                 style="font-size:18px;line-height: 1px;width: 20px;padding:10px;"></i>
+              </el-tooltip>
             </template>
           </avue-tree>
         </el-col>

+ 2 - 0
src/views/tirePartsMall/basicData/customerInformation/index.vue

@@ -6,8 +6,10 @@
           <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" style="height:73vh;"
             @save="corpTypeVisible = true">
             <template slot="addBtn">
+              <el-tooltip class="item" effect="dark" content="新建分类" placement="top">
               <i class="el-icon-setting" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
                 @click="corpTypeVisible = true"></i>
+              </el-tooltip>
             </template>
           </avue-tree>
         </el-col>

+ 1 - 0
src/views/tirePartsMall/basicData/listingManagement/commodity.json

@@ -61,6 +61,7 @@
         "label": "轮胎类别",
         "prop": "goodsTypeName",
         "addDisabled": false,
+        "search":true,
         "multiple": true,
         "overHidden": true,
         "rules": [{

+ 1 - 1
src/views/tirePartsMall/basicData/listingManagement/index.vue

@@ -411,8 +411,8 @@ export default {
     this.search.sharedCompanyList = params.sharedCompany;
     Vue.delete(params, 'sharedCompany');
     Vue.delete(this.search, 'sharedCompany');
-    done();
     this.onLoad(this.page, params)
+    done();
   },
   selectionChange(list) {
     this.selectionList = list

+ 3 - 1
src/views/tirePartsMall/basicData/supplier/index.vue

@@ -6,8 +6,10 @@
           <avue-tree :option="treeOption" :data="treeData" @node-click="nodeClick" style="height:73vh;"
             @save="corpTypeVisible = true">
             <template slot="addBtn">
-              <i class="el-icon-setting" title="新建分类" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
+              <el-tooltip class="item" effect="dark" content="新建分类" placement="top">
+              <i class="el-icon-setting"  style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"
                 @click="corpTypeVisible = true"></i>
+              </el-tooltip>
             </template>
             <template slot="addBtn">
               <i class="el-icon-refresh-right" title="刷新" style="font-size:18px;line-height: 30px;width: 20px;padding: 0 10px;"

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

@@ -1390,6 +1390,10 @@ export default {
         },
         // 新增轮胎
         rowAdd(row) {
+            if(!this.form.customerId){
+                this.$message.error('请选择客户')
+                return
+            }
             this.optionContactsBack.column.forEach(its => {
                 if (its.prop == 'goodsId' || its.prop == 'goodsNum' || its.prop == 'price' || its.prop == 'dot' || its.prop == 'remarks') {
                     its.disabled = false