소스 검색

bug修复

qymljy 9 달 전
부모
커밋
dc84e0edef

+ 2 - 2
src/HDrpManagement/afterSalesmag/components/edit.vue

@@ -15,7 +15,7 @@
             <el-col :span="24">
               <el-form-item :label="$t(`订单号`)+':'" prop="sonum">
                 <selectOrder ref="order" @selectRow="orderChange">
-                    <el-input readonly :disabled="!form.sys_enterpriseid" type="text" slot="input" size="small" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum"></el-input>
+                    <el-input readonly :disabled="!form.sys_enterpriseid || length > 0" type="text" slot="input" size="small" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum" ></el-input>
                 </selectOrder>
               </el-form-item>
             </el-col>
@@ -56,7 +56,7 @@ import selectAgent from '@/template/selectAgent/index'
 import selectOrder from './selectOrder'
 export default {
   name: "add",
-  props:['data'],
+  props:['data','length'],
   components:{selectAgent,selectOrder},
   data(){
     return {

+ 2 - 2
src/HDrpManagement/afterSalesmag/modules/detail.vue

@@ -19,7 +19,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
-        <Edit v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" class="inline-16" @onSuccess="queryMainData()" :data="mainData" />
+        <Edit v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" class="inline-16" @onSuccess="queryMainData()" :data="mainData" :length="$refs.productDetail.list.length" />
         <customBtn
           class="inline-16"
           btnName="提 交"
@@ -78,7 +78,7 @@
         />
       </div>
       <div slot="slot0" >
-        <productDetail ref="productDetail" @onSuccess="queryMainData">
+        <productDetail ref="productDetail" @onSuccess="queryMainData" >
           <addProduct v-if="mainData.status == '新建' && tool.checkAuth($route.name,'productDetailManage') && mainData" @onSuccess="$refs.productDetail.listData()" slot="addProduct" :data="mainData" />
           <template v-slot:editProduct="scope">
             <el-button v-if="mainData.status == '新建' && tool.checkAuth($route.name,'productDetailManage')" class="inline-16" type="text" size="mini" :disabled="!isEdit" @click="$refs.productDetail.currentProduct=scope.data">{{$t('编 辑')}}</el-button>

+ 2 - 2
src/HDrpManagement/aftersalesBill/components/edit.vue

@@ -15,7 +15,7 @@
             <el-col :span="24">
               <el-form-item :label="$t(`订单号`)+':'" prop="sonum">
                 <selectOrder ref="order" @selectRow="orderChange">
-                    <el-input readonly :disabled="!form.sys_enterpriseid" type="text" slot="input" size="small" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum"></el-input>
+                    <el-input readonly :disabled="!form.sys_enterpriseid || length > 0" type="text" slot="input" size="small" @focus="$refs.order.listData(),$refs.order.visible=true" v-model="form.sonum"></el-input>
                 </selectOrder>
               </el-form-item>
             </el-col>
@@ -56,7 +56,7 @@ import selectAgent from './selectAgent'
 import selectOrder from './selectOrder'
 export default {
   name: "add",
-  props:['data'],
+  props:['data','length'],
   components:{selectAgent,selectOrder},
   data(){
     return {

+ 1 - 1
src/HDrpManagement/aftersalesBill/modules/detail.vue

@@ -19,7 +19,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation" >
-        <Edit v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" class="inline-16" @onSuccess="queryMainData()" :data="mainData" />
+        <Edit v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" class="inline-16" @onSuccess="queryMainData()" :data="mainData" :length="$refs.productDetail.list.length" />
         <customBtn
           class="inline-16"
           btnName="提 交"

+ 9 - 7
src/SDrpManagement/ProductGroup/modules/GroupDetail/groupDetail.vue

@@ -178,7 +178,9 @@
           </el-tag>
         </div>
       </div>-->
-        <div style="padding-right: 20px">
+        <div style="padding-right: 20px" v-if="selectProduct.itemextend && selectProduct.itemextend.length && (selectProduct.itemextend[0].device || selectProduct.itemextend[0].prodline
+        || selectProduct.itemextend[0].pressure || selectProduct.itemextend[0].butterflyplatedrive || selectProduct.itemextend[0].connection || selectProduct.itemextend[0].valveplatematerial
+        || selectProduct.itemextend[0].actuatortype || selectProduct.itemextend[0].actuatorbrand) || selectProduct.itemextend[0].specalnote">
           <div
             style="
               width: 100%;
@@ -201,12 +203,6 @@
                   selectProduct.itemextend[0].prodline
                 }}</span>
               </el-col>
-              <el-col :span="8" style="margin-bottom: 10px">
-                <span class="search__label">{{ $t("备注") }}:</span>
-                <span class="tab-color">{{
-                  selectProduct.itemextend[0].specalnote
-                }}</span>
-              </el-col>
               <el-col :span="8" v-if="selectProduct.itemextend[0].pressure && siteid != 'HY'" style="margin-bottom: 10px">
                 <span class="search__label">{{ $t("压力等级") }}:</span>
                 <span class="tab-color">{{
@@ -255,6 +251,12 @@
                   selectProduct.itemextend[0].actuatorbrand
                 }}</span>
               </el-col>
+              <el-col :span="8" style="margin-bottom: 10px" v-if="selectProduct.itemextend[0].specalnote">
+                <span class="search__label">{{ $t("备注") }}:</span>
+                <span class="tab-color">{{
+                    selectProduct.itemextend[0].specalnote
+                  }}</span>
+              </el-col>
             </el-row>
           </div>
         </div>