工具借用管理，工具借用业务，工具借用，物流单，发货单新增公称通径和公称压力字段

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -23,7 +23,18 @@
               <el-input v-if="data.status === '新建'" v-model="scope.column.data.remarks" :placeholder="$t(`输入订单备注`)" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
               <p v-else>{{scope.column.data.remarks}}</p>
             </div>
-            <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
+            <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+              <div v-else>--</div>
+            </div>
+            <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
           </template>
           <template v-slot:opreation="scope">
             <el-button type="text" size="mini" @click="deleteOrderProduct(scope.data)" :disabled="data.status !== '新建'">{{$t(`删 除`)}}</el-button>

src/HDrpManagement/logistics/details/tabs/logisticsBox/add.vue

@@ -45,9 +45,30 @@
                 :label="$t('型号')"
                 width="180">
               </el-table-column>
+              <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+                <template slot-scope="scope">
+                  <p>
+                    <span>{{ scope.row.caliber || '--'}}</span>
+                  </p>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+                <template slot-scope="scope">
+                 <span v-if="scope.row.nominalpressure">
+                    <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
+                      <span v-if="index == scope.row.nominalpressure.length -1">
+                        {{item}}
+                      </span>
+                      <span v-else>{{item}},</span>
+                    </span>
+                  </span>
+                  <div v-else>--</div>
+                </template>
+              </el-table-column>
               <el-table-column
                 prop="spec"
                 :label="$t(`规格尺寸`)"
+                v-if="siteid != 'HY' && siteid != 'YOSTEST1'"
                 width="180">
               </el-table-column>
               <el-table-column
@@ -107,7 +128,8 @@ export default {
         boxnum: [
           { required: true, message: this.$t('请输入箱码'), trigger: 'blur' },
         ]
-      }
+      },
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   components:{

src/HDrpManagement/logistics/modules/productlist.vue

@@ -26,8 +26,28 @@
           <p><span>{{scope.row.model}}</span></p>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+          <p>
+            <span>{{ scope.row.caliber || '--'}}</span>
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+         <span v-if="scope.row.nominalpressure">
+            <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
+              <span v-if="index == scope.row.nominalpressure.length -1">
+                {{item}}
+              </span>
+              <span v-else>{{item}},</span>
+            </span>
+          </span>
+          <div v-else>--</div>
+        </template>
+      </el-table-column>
       <el-table-column
-          :label="$t('规格')">
+          :label="$t('规格')" v-if="siteid != 'HY' && siteid != 'YOSTEST1'">
         <template slot-scope="scope">
           <p><span>{{scope.row.spec}}</span></p>
         </template>
@@ -88,7 +108,8 @@ export default {
       },
       total:0,
       currentPage:0,
-      time: null
+      time: null,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -222,7 +222,18 @@
           <div v-else-if="scope.column.columnname === 'remarks'">
             <el-input v-model="scope.column.data.remarks" :placeholder="$t(`输入订单备注`)" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
           </div>
-          <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+          <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+            <div v-else>--</div>
+          </div>
+          <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         <template v-slot:opreation="scope">
           <el-button v-if="data.status == '新建'" type="text" size="mini" @click="deleteOrderProduct(scope.data)">{{$t('删 除')}}</el-button>

src/HDrpManagement/toolBorrowingMag/detail/tabs/toolList.vue

@@ -72,7 +72,27 @@
           </p>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('规格')" width="150" prop="spec">
+      <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+          <p>
+            <span>{{ scope.row.caliber }}</span>
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+         <span v-if="scope.row.nominalpressure">
+            <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
+              <span v-if="index == scope.row.nominalpressure.length -1">
+                {{item}}
+              </span>
+              <span v-else>{{item}},</span>
+            </span>
+          </span>
+          <div v-else>--</div>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('规格')" width="150" prop="spec" v-if="siteid != 'HY' && siteid != 'YOSTEST1'">
         <template slot-scope="scope">
           <p>
             <span>{{ scope.row.spec }}</span>
@@ -282,6 +302,7 @@ export default {
       currentPage: 0,
       time: null,
       value2: "",
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   components: {

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -171,6 +171,17 @@
             {{scope.column.data[scope.column.columnname]?tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥'):'¥0.00'}}
           </div>
           <div v-else-if="scope.column.columnname == 'operation'"></div>
+          <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+            <div v-else>--</div>
+          </div>
           <p v-else>{{ $t(scope.column.data[scope.column.columnname]) || '--'}}</p>
         </template>
         <template v-slot:opreation="scope">

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -177,6 +177,17 @@
             {{scope.column.data[scope.column.columnname]?tool.formatAmount(scope.column.data[scope.column.columnname],2,'¥'):'¥0.00'}}
           </div>
           <div v-else-if="scope.column.columnname == 'operation'"></div>
+          <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+            <div v-else>--</div>
+          </div>
           <p v-else>{{ $t(scope.column.data[scope.column.columnname]) || '--' }}</p>
         </template>
         <template v-slot:opreation="scope">

src/SDrpManagement/salerToolBorrowing/detail/tabs/toolList.vue

@@ -61,7 +61,27 @@
           </p>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('规格')" prop="spec" width="150">
+      <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+          <p>
+            <span>{{ scope.row.caliber }}</span>
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+         <span v-if="scope.row.nominalpressure">
+            <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
+              <span v-if="index == scope.row.nominalpressure.length -1">
+                {{item}}
+              </span>
+              <span v-else>{{item}},</span>
+            </span>
+          </span>
+          <div v-else>--</div>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('规格')" prop="spec" width="150" v-if="siteid != 'HY' && siteid != 'YOSTEST1'">
         <template slot-scope="scope">
           <p>
             <span>{{ scope.row.spec }}</span>
@@ -270,6 +290,7 @@ export default {
       currentPage: 0,
       time: null,
       value2: "",
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   components: {

src/SDrpManagement/toolBorrowing/detail/tabs/toolList.vue

@@ -62,7 +62,27 @@
           </p>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('规格')" width="150" prop="spec">
+      <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+          <p>
+            <span>{{ scope.row.caliber }}</span>
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+         <span v-if="scope.row.nominalpressure">
+            <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
+              <span v-if="index == scope.row.nominalpressure.length -1">
+                {{item}}
+              </span>
+              <span v-else>{{item}},</span>
+            </span>
+          </span>
+          <div v-else>--</div>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('规格')" width="150" prop="spec" v-if="siteid != 'HY' && siteid != 'YOSTEST1'">
         <template slot-scope="scope">
           <p>
             <span>{{ scope.row.spec }}</span>
@@ -272,6 +292,7 @@ export default {
       currentPage: 0,
       time: null,
       value2: "",
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   components: {

src/template/addProduct/index1.vue

@@ -178,7 +178,18 @@
                     :deletebtn="false"
                 ></previewImage>
               </p>
-              <p v-else>{{ $t(scope.column.data[scope.column.columnname]) }}</p>
+              <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+                <div v-else>--</div>
+              </div>
+              <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
             </template>
             <template v-slot:opreation="scope">
               <el-button type="text" size="mini" @click="addProduct(scope)">{{

src/template/addTool/index.vue

@@ -35,7 +35,18 @@
               <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>{{$t(scope.column.data[scope.column.columnname])}}</p>
+              <div v-else-if="scope.column.columnname === 'nominalpressure'">
+                <span v-if="scope.column.data.nominalpressure">
+                  <span v-for="(item,index) in scope.column.data.nominalpressure" :key="index">
+                    <span v-if="index == scope.column.data.nominalpressure.length -1">
+                      {{item}}
+                    </span>
+                    <span v-else>{{item}},</span>
+                  </span>
+                </span>
+                <div v-else>--</div>
+              </div>
+              <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
             </template>
             <template v-slot:opreation="scope">
               <el-button type="text" size="mini" @click="addProduct(scope)">{{$t('添 加')}}</el-button>

src/template/invoiceCanUseProduct/index.vue

@@ -41,7 +41,28 @@
           <p><span>{{scope.row.model}}</span></p>
         </template>
       </el-table-column>
+      <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+          <p>
+            <span>{{ scope.row.caliber || '--'}}</span>
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+         <span v-if="scope.row.nominalpressure">
+            <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
+              <span v-if="index == scope.row.nominalpressure.length -1">
+                {{item}}
+              </span>
+              <span v-else>{{item}},</span>
+            </span>
+          </span>
+          <div v-else>--</div>
+        </template>
+      </el-table-column>
       <el-table-column
+          v-if="siteid != 'HY' && siteid != 'YOSTEST1'"
           :label="$t('规格')"
           width="180">
         <template slot-scope="scope">
@@ -120,7 +141,8 @@ export default {
       tableSelectData:[],
       tableData: [],
       total:0,
-      currentPage:0
+      currentPage:0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   components:{

src/template/logisticsCanUseProduct/index.vue

@@ -34,8 +34,29 @@
         :label="$t('型号')"
         width="180">
       </el-table-column>
+      <el-table-column :label="$t('公称通径')" width="150" prop="caliber" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+          <p>
+            <span>{{ scope.row.caliber || '--'}}</span>
+          </p>
+        </template>
+      </el-table-column>
+      <el-table-column :label="$t('公称压力')" width="150" prop="nominalpressure" v-if="siteid == 'HY' || siteid == 'YOSTEST1'">
+        <template slot-scope="scope">
+         <span v-if="scope.row.nominalpressure">
+            <span v-for="(item,index) in scope.row.nominalpressure" :key="index">
+              <span v-if="index == scope.row.nominalpressure.length -1">
+                {{item}}
+              </span>
+              <span v-else>{{item}},</span>
+            </span>
+          </span>
+          <div v-else>--</div>
+        </template>
+      </el-table-column>
       <el-table-column
         prop="spec"
+        v-if="siteid != 'HY' && siteid != 'YOSTEST1'"
         :label="$t(`规格尺寸`)"
         width="180">
       </el-table-column>
@@ -79,7 +100,8 @@ export default {
       tableSelectData:[],
       tableData:[],
       currentPage:0,
-      total:0
+      total:0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{