浏览代码

修改bug

Qukatie 7 月之前
父节点
当前提交
1955c6a7fb

+ 1 - 1
src/views/landTransportation/dispatchingCars/detailPage.vue

@@ -319,7 +319,7 @@
           <el-button type="text" size="small" :icon="row.$cellEdit ? 'el-icon-circle-plus-outline' : 'el-icon-edit'"
             @click="paymentRowCell(row, index)">{{ row.$cellEdit ? '保存' : '编辑' }}
           </el-button>
-          <el-button type="text" icon="el-icon-delete" size="small" :disabled="goodsForm.status === 1"
+          <el-button type="text" icon="el-icon-delete" size="small"
             @click="$refs.payment.rowDel(row, index)">删除
           </el-button>
           <el-button size="small" type="text" icon="el-icon-s-order" @click="annexOpen(row, index)">附 件

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

@@ -24,10 +24,11 @@
                 <avue-form ref="form" class="trading-form" v-model="form" :option="option" :key="key">
                     <template slot="goodsTypeId" slot-scope="{disabled}">
                         <div style="display:flex;">
-                            <avue-cascader :disabled="disabled" :emit-path="false" check-strictly :show-all-levels="false"
-                                v-model="form.goodsTypeId" placeholder="请选择产品分类" :dic="goodsTypeList"
-                                :props="props"></avue-cascader>
-                            <i class="el-icon-circle-plus-outline" style="font-size:18px;line-height: 32px;margin-left:4px"
+                            <avue-cascader :disabled="disabled" :emit-path="false" check-strictly
+                                :show-all-levels="false" v-model="form.goodsTypeId" placeholder="请选择产品分类"
+                                :dic="goodsTypeList" :props="props"></avue-cascader>
+                            <i class="el-icon-circle-plus-outline"
+                                style="font-size:18px;line-height: 32px;margin-left:4px"
                                 @click="goodsTypeVisible = true"></i>
                         </div>
                     </template>
@@ -35,7 +36,8 @@
                         <div style="display:flex;">
                             <avue-select :disabled="disabled" v-model="form.unit" filterable placeholder="请选择单位"
                                 :dic="unitList" :props="props2"></avue-select>
-                            <i class="el-icon-circle-plus-outline" style="font-size:18px;line-height: 32px;margin-left:4px"
+                            <i class="el-icon-circle-plus-outline"
+                                style="font-size:18px;line-height: 32px;margin-left:4px"
                                 @click="$refs.dictbiz.open()"></i>
                         </div>
                     </template>
@@ -126,7 +128,7 @@ import { optionList } from "./js/optionList";
 import goodsType from '@/components/goodsType/index'
 import corpType from './components/index'
 import { brandfigureListAll } from "@/api/tirePartsMall/basicData/listingManagement";
-
+import { isProcurement } from "@/api/basicData/configuration";
 export default {
     name: "index",
     data() {
@@ -624,6 +626,11 @@ export default {
         }
     },
     async created() {
+        isProcurement({ "param": "whether.model" }).then(res => {
+            if (res.data.data == 1) {
+                this.findObject(this.option.column, "brandItem").label = '规格型号1'
+            }
+        })
         this.optionList = await this.getColumnData(
             this.getColumnName(218),
             optionList
@@ -914,4 +921,5 @@ export default {
         font-weight: 600;
         text-align: center;
     }
-}</style>
+}
+</style>

+ 7 - 1
src/views/wel/home/xindongPower/xindongPower.vue

@@ -1,7 +1,7 @@
 <template>
     <!--青岛鑫动力-->
     <div class="xindongpowerBox">
-        <div class="statisticsFlex">
+        <div class="statisticsFlex" v-if="homeStatistics==='1'">
             <div class="statisticsBox">
                 <div class="statisticsTop">
                     <div class="statisticsTop_ioc">
@@ -280,6 +280,7 @@ import { xinsalaryDataChain, xinsalesList, amountStatistics, stayDoOrder, column
 import { dateFormat, getYearDate } from "@/util/date";
 import { getParamservice } from "@/api/tirePartsMall/purchasingManagement/warehouseEntryOrder";
 import '@/assets/icon/homeicon/iconfont.css'
+import { isProcurement } from "@/api/basicData/configuration";
 export default {
     components: { indexCard, xinsalesTrend },
     props: {
@@ -308,9 +309,14 @@ export default {
             saberUserInfo: {}, // 当前登录人数据
             overviewForm: {},
             inShow: false,
+            homeStatistics:'1',
         }
     },
     created() {
+        isProcurement({ "param": "home.statistics" }).then(res => {
+            // res.data.data === '1'
+            this.homeStatistics = res.data.data===false?'1':res.data.data
+        })
         this.amountStatisticsfun()
         this.annual3 = getYearDate().toString(); // 获取当前时间
         this.annual4 = getYearDate().toString(); // 获取当前时间