暂存

src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -3,45 +3,69 @@
     <div class="normal-margin">
       <el-descriptions :column="3" :labelStyle="{width:'120px',flex:'1 0 auto',}" :contentStyle="{width:'250px',flex:'1 0 auto'}" border>
         <div slot="title" class="my-label__title">{{$t('基本信息')}}</div>
-        <el-descriptions-item  :label="$t(`商品编码`)">{{ basic.itemno}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`商品名称`)">{{ basic.itemname}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`商品编码`)">{{ basic.itemno || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`商品名称`)">{{ basic.itemname || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t('状态')"><span :style="tool.getStatusColor(basic.status)">{{ $t(basic.status)}}</span></el-descriptions-item>
-        <el-descriptions-item :label="$t('品号')">{{ basic.erpitemno}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`品名`)">{{ basic.erpitemname}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('品号')">{{ basic.erpitemno || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`品名`)">{{ basic.erpitemname || '--'}}</el-descriptions-item>
 <!--        <el-descriptions-item  :label="$t(`外形尺寸`)">长:{{ basic.length}};宽:{{basic.width}};高:{{basic.height}}</el-descriptions-item>-->
         <el-descriptions-item  :label="$t(`上/下架`)"><span :style="{color:basic.isonsale ? tool.getStatusColor('上架',true) : tool.getStatusColor('下架',true)}">{{ basic.isonsale ? $t('上架') : $t('下架')}}</span></el-descriptions-item>
-        <el-descriptions-item  :label="$t('型号')">{{ basic.model}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`规格尺寸`)">{{ basic.spec}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`计量单位组`)">{{ basic.unitname}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t('型号')">{{ basic.model || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`规格尺寸`)">{{ basic.spec || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`计量单位组`)">{{ basic.unitname || '--'}}</el-descriptions-item>
 <!--        <el-descriptions-item  :label="$t(`辅助单位`)">{{ basic.auxunitname}}</el-descriptions-item>-->
-        <el-descriptions-item  :label="$t(`装箱数`)">{{ basic.packqty}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`营销类别`)"><span v-for="item in basic.itemclass" :key="item.index">{{ item.itemclassname}},</span></el-descriptions-item>
+        <el-descriptions-item  :label="$t(`装箱数`)">{{ basic.packqty || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`营销类别`)">
+          <div v-if="basic.itemclass">
+            <span v-for="(item,index) in basic.itemclass" :key="item.index">
+              <span v-if="(index == 0 && basic.itemclass.length == 1) || index == basic.itemclass.length -1">{{item.itemclassname}}</span>
+              <span v-else>{{item.itemclassname}},</span>
+            </span>
+          </div>
+          <div v-else>--</div>
+        </el-descriptions-item>
 
-        <el-descriptions-item :label="$t('公称通径')">{{ basic.caliber}}</el-descriptions-item>
-        <el-descriptions-item :label="$t('公称压力')">{{ basic.nominalpressure}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('公称通径')" v-if="siteid === 'HY' || siteid === 'YOSTEST1'">{{ basic.caliber || '--'}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('公称压力')" v-if="siteid === 'HY' || siteid === 'YOSTEST1'">
+          <div v-if="basic.nominalpressure">
+            <span v-for="(item,index) in basic.nominalpressure" :key="item.index">
+              <span v-if="(index == 0 && basic.nominalpressure.length == 1) || index == basic.nominalpressure.length -1">{{item}}</span>
+              <span v-else>{{item}},</span>
+            </span>
+          </div>
+          <div v-else>--</div>
+        </el-descriptions-item>
 
-        <el-descriptions-item  :label="$t(`领域`)"><span v-for="item in basic.tradefield" :key="item.index">{{ item.tradefield}},</span></el-descriptions-item>
-        <el-descriptions-item  :label="$t('品牌')">{{ basic.brand && basic.brand[0]?basic.brand[0].brandname:''}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`领域`)">
+          <div v-if="basic.tradefield">
+            <span v-for="(item,index) in basic.tradefield" :key="item.index">
+              <span v-if="(index == 0 && basic.tradefield.length == 1) || index == basic.nominalpressure.length -1">{{item.tradefield}}</span>
+              <span v-else>{{item.tradefield}},</span>
+            </span>
+          </div>
+          <div v-else>--</div>
+        </el-descriptions-item>
+        <el-descriptions-item  :label="$t('品牌')">{{ basic.brand && basic.brand[0]?basic.brand[0].brandname:'--'}}</el-descriptions-item>
 
-        <el-descriptions-item :label="$t('材质')">{{ basic.material}}</el-descriptions-item>
-        <el-descriptions-item :label="$t('装置')">{{ basic.device}}</el-descriptions-item>
-        <el-descriptions-item :label="$t('产线')">{{ basic.prodline}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t('特殊说明')">{{ basic.specalnote}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`产品标准`)">{{ basic.standards}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`重量`)">{{$t(`毛重`)}}:{{ basic.grossweight}};{{$t(`净重`)}}:{{basic.weight}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('材质')">{{ basic.material || '--'}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('装置')">{{ basic.device || '--'}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('产线')">{{ basic.prodline || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t('特殊说明')">{{ basic.specalnote || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`产品标准`)">{{ basic.standards || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`重量`)">{{$t(`毛重`)}}:{{ basic.grossweight || '--'}};{{$t(`净重`)}}:{{basic.weight || '--'}}</el-descriptions-item>
 <!--        <el-descriptions-item  :label="$t(`条形码`)">{{ basic.barcode}}</el-descriptions-item>-->
         <el-descriptions-item  :label="$t(`是否序列号管理`)" >
           <span :style="{color:basic.skucontrol?tool.getStatusColor('是',true):tool.getStatusColor('否',true)}">{{ basic.skucontrol ? $t('是') : $t('否')}}</span>
         </el-descriptions-item>
         <el-descriptions-item  :label="$t(`交期信息`)">{{ basic.delivery ? basic.delivery + ' ' + $t('天') : $t('不限制')}}</el-descriptions-item>
 <!--        <el-descriptions-item  :label="$t(`建议零售价`)">{{ tool.formatAmount(basic.price,2)}}</el-descriptions-item>-->
-        <el-descriptions-item  :label="$t(`压力等级`)">{{ basic.pressure}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`蝶板驱动`)">{{ basic.butterflyplatedrive}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`连接形式`)">{{ basic.connection}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`阀板材质`)">{{ basic.valveplatematerial}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`阀体材质`)">{{ basic.bodymaterial}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`执行器类型`)">{{ basic.actuatortype}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`执行器品牌`)">{{ basic.actuatorbrand}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`压力等级`)">{{ basic.pressure || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`蝶板驱动`)">{{ basic.butterflyplatedrive || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`连接形式`)">{{ basic.connection || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`阀板材质`)">{{ basic.valveplatematerial || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`阀体材质`)">{{ basic.bodymaterial || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`执行器类型`)">{{ basic.actuatortype || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`执行器品牌`)">{{ basic.actuatorbrand || '--'}}</el-descriptions-item>
 
         <el-descriptions-item  :label="$t(`是否营销物料`)"  >
           <span :style="{color:basic.iswuliao?tool.getStatusColor('是',true):tool.getStatusColor('否',true)}">{{ basic.iswuliao ? $t('是'):$t('否')}}</span>
@@ -55,9 +79,9 @@
         <el-descriptions-item  :label="$t(`是否中线蝶阀`)"  >
           <span :style="{color:basic.isbutterfly?tool.getStatusColor('是',true):tool.getStatusColor('否',true)}">{{ basic.isbutterfly ? $t('是'):$t('否')}}</span>
         </el-descriptions-item>
-        <el-descriptions-item  :label="$t(`库存充足标准`)">{{ basic.stockstatus1}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`库存缺货标准`)">{{ basic.stockstatus2}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`质保期(年)`)">{{ basic.warrantyday}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`库存充足标准`)">{{ basic.stockstatus1 || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`库存缺货标准`)">{{ basic.stockstatus2 || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`质保期(年)`)">{{ basic.warrantyday || '--'}}</el-descriptions-item>
 
 
       </el-descriptions>
@@ -85,6 +109,7 @@ export default {
   props:["basic"],
   data(){
     return {
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
     }
   },
   watch:{

src/template/addProduct/index.vue

@@ -34,6 +34,9 @@
             <template v-slot:customcol="scope">
               <p v-if="scope.column.columnname === 'cover'">
                 <previewImage v-if="scope.column.data.attinfos[0]" class="image" :image="scope.column.data.attinfos[0]" :list="scope.column.data.attinfos" :deletebtn="false"></previewImage>
+              </p>
+              <p v-else-if="scope.column.columnname === 'nominalpressure'">
+
               </p>
               <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
             </template>
@@ -144,7 +147,7 @@ export default {
       try {
         this.$refs.tableTemp.$refs.table.doLayout()
       } catch (error) {
-        
+
       }
     },
     /*获取品牌*/