Merge remote-tracking branch 'origin/develop' into develop

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue

@@ -106,7 +106,7 @@
                            value-format="yyyy-MM-dd"
             ></el-datePicker>
           </el-form-item>
-          <el-form-item label="标准状态" prop="standStatus" class="add-form-item form-item-disabled">
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
             <el-select v-model="form.standStatus" filterable disabled>
               <el-option
                       v-for="item in opinionsStand"

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formList.vue

@@ -90,7 +90,7 @@
             <el-datePicker v-model="form.putTime" :disabled="disabledState"
                            :editable="false"></el-datePicker>
           </el-form-item>
-          <el-form-item label="标准状态" prop="standStatus" class="add-form-item form-item-disabled">
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
             <el-select v-model="form.standStatus" filterable :disabled="disabledState">
               <el-option
                       v-for="item in opinionsStand"

src/pages/processCenter/pages/creatProcess/qbrk-product/common/formListIn.vue

@@ -94,7 +94,7 @@
                     clearable
             ></el-input>
           </el-form-item>
-          <el-form-item label="标准状态" prop="standStatus" class="add-form-item form-item-disabled">
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
             <el-select v-model="form.standStatus" filterable clearable :disabled="disabledState" >
               <el-option
                       v-for="item in opinionsStand"

src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue

@@ -138,7 +138,7 @@
                                                    value-format="yyyy-MM-dd"
                                     ></el-datePicker>
                                 </el-form-item>
-                                <el-form-item label="标准状态" prop="standStatus" class="add-form-item form-item-disabled">
+                                <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
                                     <el-select v-model="form.standStatus" filterable clearable>
                                         <el-option
                                                 v-for="item in opinionsStand"
@@ -1429,7 +1429,7 @@
                         {required: true, message: "请选择截止日期", trigger: "change"}
                     ],
                     standStatus: [
-                        { required: true, message: '请选择标准状态', trigger: 'change' }
+                        { required: true, message: '请选择制修订类型', trigger: 'change' }
                     ],
                     standNumber: [
                         { required: true, message: '请输入企标编号', trigger: 'blur' },

src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue

@@ -213,6 +213,11 @@
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
                   }}-{{ scope.row.standYear }}</a>
+                <a v-else-if="scope.row.standYear && textStatusMap[scope.row.textStatus] === '参考' "
+                   class="table-jump" style="color: #98E165"
+                   @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
+                    scope.row.standNumber
+                  }}-{{ scope.row.standYear }}</a>
                 <a v-else-if="scope.row.standYear" class="table-jump" style="color: #333333"
                    @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{
                     scope.row.standNumber
@@ -233,6 +238,10 @@
                    @click="handlePreview(scope.row)" class="table-jump" style="color: #F56C6C">{{
                     scope.row.standName
                   }}</a>
+                <a v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                   @click="handlePreview(scope.row)" class="table-jump" style="color: #98E165">{{
+                    scope.row.standName
+                  }}</a>
                 <a v-else @click="handlePreview(scope.row)" style="color: #333333"
                    class="table-jump">{{ scope.row.standName }}</a>
               </template>
@@ -246,6 +255,9 @@
                 <span
                   v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #F56C6C">{{ scope.row.issueTime }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.issueTime }}</span>
                 <span v-else>{{ scope.row.issueTime }}</span>
               </template>
             </el-table-column>
@@ -258,6 +270,9 @@
                 <span
                   v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #F56C6C">{{ scope.row.SSRQ }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.SSRQ }}</span>
                 <span v-else>{{ scope.row.SSRQ }}</span>
 
               </template>
@@ -271,6 +286,9 @@
                 <span
                   v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #F56C6C">{{ scope.row.XCXSSRQ }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.XCXSSRQ }}</span>
                 <span v-else>{{ scope.row.XCXSSRQ }}</span>
               </template>
             </el-table-column>
@@ -282,6 +300,9 @@
                 <span
                   v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
                   style="color: #F56C6C">{{ scope.row.ZCCSSRQ }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.ZCCSSRQ }}</span>
                 <span v-else>{{ scope.row.ZCCSSRQ }}</span>
               </template>
             </el-table-column>
@@ -289,6 +310,15 @@
               prop="dtbzh"
               width="200"
               label="代替标准号">
+              <template slot-scope="scope">
+                <span
+                  v-if="textStatusMap[scope.row.textStatus] === '废止' || textStatusMap[scope.row.textStatus] === '被代替'"
+                  style="color: #F56C6C">{{ scope.row.dtbzh }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ scope.row.dtbzh }}</span>
+                <span v-else>{{ scope.row.dtbzh }}</span>
+              </template>
             </el-table-column>
             <el-table-column
               prop="textStatus"
@@ -304,6 +334,9 @@
                   style="color: #F56C6C">{{
                     textStatusMap[scope.row.textStatus]
                   }}</span>
+                <span
+                  v-else-if="textStatusMap[scope.row.textStatus] === '参考' "
+                  style="color: #98E165">{{ textStatusMap[scope.row.textStatus] }}</span>
                 <span v-else>{{ textStatusMap[scope.row.textStatus] }}</span>
               </template>
             </el-table-column>

src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue

@@ -2385,14 +2385,14 @@ export default {
           {validator: this.verify.testItemCode, trigger: 'change'},
           {type: 'string', max: 20, message: '标准年份/系列不能超过20个字符', trigger: 'change'}
         ],
-        standName: [
+        // standName: [
-          {required: true, message: '标准名称不能为空', trigger: 'change'},
+        //   {required: true, message: '标准名称不能为空', trigger: 'change'},
-          {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
+        //   {type: 'string', max: 500, message: '标准名称不能超过500个字符', trigger: 'change'}
-        ],
+        // ],
-        standEnName: [
+        // standEnName: [
-          {type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'},
+        //   {type: 'string', max: 1000, message: '标准英文名称不能超过1000个字符', trigger: 'change'},
-          {validator: this.verify.valiateEnName, trigger: 'blur'}
+        //   {validator: this.verify.valiateEnName, trigger: 'blur'}
-        ],
+        // ],
         synopsis: [
           {type: 'string', max: 1000, message: '文本说明不能超过1000个字符', trigger: 'change'}
         ],