Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/ProductMag/modules/add.vue

@@ -54,7 +54,9 @@
             </el-col>
             <el-col :span="12" v-if="siteid === 'HY' || siteid === 'YOSTEST1'">
               <el-form-item :label="$t(`公称压力`)" prop="nominalpressure">
-                <el-input  v-model="form.nominalpressure" :placeholder="$t(`输入公称压力`)"></el-input>
+                <el-select v-model="form.nominalpressure" style="width:100%" @focus="pressureChange" multiple>
+                  <el-option v-for="item in nominalpressure" :key="item.index" :value="item.value" :label="$t(item.value)"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -457,7 +459,8 @@ export default {
       categoriesList:[],//商品大类
       siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       Fproduct:{},//成品
-      prodlines:[]
+      prodlines:[],
+      nominalpressure:[]
     }
   },
   computed:{
@@ -768,6 +771,13 @@ export default {
 
       this.form.categories = this.categoriesList.length > 0?this.categoriesList[0].remarks:''
     },
+    /*公称压力*/
+    async pressureChange(){
+      if (this.nominalpressure.length < 1){
+        let res = await this.$store.dispatch('optiontypeselect','nominalpressure')
+        this.nominalpressure = res.data
+      }
+    },
     hasDisabledTag (item) {
       let arr = []
       let arr2 = []

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -54,7 +54,9 @@
             </el-col>
             <el-col :span="12" v-if="siteid === 'HY' || siteid === 'YOSTEST1'">
               <el-form-item :label="$t(`公称压力`)" prop="nominalpressure">
-                <el-input  v-model="form.nominalpressure" :placeholder="$t(`输入公称压力`)" :disabled="form.itemtype == '成品'"></el-input>
+                <el-select v-model="form.nominalpressure" style="width:100%" @focus="pressureChange" multiple :disabled="form.itemtype == '成品'">
+                  <el-option v-for="item in nominalpressure" :key="item.index" :value="item.value" :label="$t(item.value)"></el-option>
+                </el-select>
               </el-form-item>
             </el-col>
             <el-col :span="24">
@@ -460,7 +462,8 @@ export default {
       siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       categoriesList:[],
       prodlines:[],
-      standardsmx:[]
+      standardsmx:[],
+      nominalpressure:[]
     }
   },
   computed: {
@@ -587,6 +590,13 @@ export default {
       })
       this.unitGroupData = res.data
     },
+    /*公称压力*/
+    async pressureChange(){
+      if (this.nominalpressure.length < 1){
+        let res = await this.$store.dispatch('optiontypeselect','nominalpressure')
+        this.nominalpressure = res.data
+      }
+    },
     onSubmit () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false

src/HDrpManagement/projectChange/modules/modules/productSet/index.vue

@@ -571,7 +571,7 @@ export default {
       if (val < 0) {
         data.price = 0;
       } else {
-        data.price = this.tool.formatAmount(val, 2);
+        data.price = Math.round(val*100)/100
       }
       data.amount = this.tool.formatAmount(data.price * data.qty, 2);
       this.$set(this.list, index, data);

src/HDrpManagement/projectData/index.vue

@@ -1503,7 +1503,7 @@
                         <el-option
                             v-for="item in projectType"
                             :key="item.value"
-                            :label="$t(item.value)"
+                            :label="$t(item.value + item.remarks)"
                             :value="item.value">
                           <span style="float: left">{{ $t(item.value) }}</span>
                           <span style="float: right; color: #8492a6; font-size: 12px">{{ item.remarks?$t(item.remarks):$t('暂无描述') }}</span>
@@ -3209,7 +3209,7 @@ export default {
           isGroup: true,
           xField: 'datetype',
           yField: 'value',
-          seriesField: 'key',
+          seriesField: 'projecttype',
           label:{
             position:top
           },

src/HManagement/task/modules/add.vue

@@ -173,6 +173,9 @@ export default {
         leaderuserid: [
           {required: true, message:this.$t('请选择执行人'), trigger: 'change'},
         ],
+        tableName: [
+          {required: JSON.parse(sessionStorage.getItem('active_account')).siteid == 'HY' || JSON.parse(sessionStorage.getItem('active_account')).siteid == 'YOSTEST1'?true:false, message:this.$t('请选择关联应用数据'), trigger: 'change'},
+        ],
       },
 			// 查询可选择人员参数
 			param:{

src/SDrpManagement/Products/modules/list.vue

@@ -43,8 +43,8 @@
               <p class="descript">{{ $t("商品编号") }}：{{ item.itemno }}</p>
               <p class="descript" v-if="siteid !== 'YOSTEST1' && siteid !== 'HY'">{{ $t("规格") }}：{{ item.spec }}</p>
               <p class="descript">{{ $t("型号") }}：{{ $t(item.model ) }}</p>
-              <p class="descript" v-if="siteid !== 'YOSTEST1' || siteid !== 'HY'">{{ $t("公称通径") }}：{{ $t(item.caliber || '--' ) }}</p>
-              <p class="descript" v-if="siteid !== 'YOSTEST1' || siteid !== 'HY'">{{ $t("公称压力") }}：
+              <p class="descript" v-if="siteid == 'YOSTEST1' || siteid == 'HY'">{{ $t("公称通径") }}：{{ $t(item.caliber || '--' ) }}</p>
+              <p class="descript" v-if="siteid == 'YOSTEST1' || siteid == 'HY'">{{ $t("公称压力") }}：
                 <span v-if="item.nominalpressure && item.nominalpressure[0] != null">
                   <span v-for="(k,index) in item.nominalpressure" :key="index">
                     <span v-if="index == (item.nominalpressure.length -1)">