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

src/pages/processCenter/pages/creatProcess/bzrk/step1.vue

@@ -2764,6 +2764,10 @@ export default {
       // this.$refs.selections.selectAll(false)
       // }
       // this.sarBussionessLawsEO.replaceLawsNum = ''
+      this.replaceLawsNumForm = {
+        standName: '',
+        standNumber: '',
+      }
       this.replaceLawsNumModel = true
       this.replaceLawType = ''
       this.replaceLawType = type

src/pages/processCenter/pages/creatProcess/bzrk/step2.vue

@@ -558,6 +558,7 @@
                 <el-form-item label="代替标准号" prop="dtbjh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.dtbjh" effect="dark" :content=form.dtbjh placement="top-start">
                     <el-input
+                            disabled
                             v-model="form.dtbjh"
                             placeholder="请输入代替标准号"
                             clearable
@@ -565,6 +566,7 @@
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.dtbjh"
                           placeholder="请输入代替标准号"
                           clearable
@@ -588,6 +590,7 @@
                 <el-form-item label="部分代替标准号" prop="bfbdtbzh" class="add-form-item form-item-disabled">
                   <el-tooltip v-if="form.bfbdtbzh" effect="dark" :content=form.bfbdtbzh placement="top-start">
                     <el-input
+                            disabled
                             v-model="form.bfbdtbzh"
                             placeholder="请输入部分代替标准号"
                             clearable
@@ -595,6 +598,7 @@
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.bfbdtbzh"
                           placeholder="请输入部分代替标准号"
                           clearable
@@ -604,12 +608,14 @@
                   <el-tooltip v-if="form.cbbh" effect="dark" :content=form.cbbh placement="top-start">
                     <el-input
                             v-model="form.cbbh"
+                            disabled
                             placeholder="请输入采标编号"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.cbbh"
                           placeholder="请输入采标编号"
                           clearable
@@ -619,12 +625,14 @@
                   <el-tooltip v-if="form.yybj" effect="dark" :content=form.yybj placement="top-start">
                     <el-input
                             v-model="form.yybj"
+                            disabled
                             placeholder="请输入引用标准"
                             clearable
                     ></el-input>
                   </el-tooltip>
                   <el-input
                           v-else
+                          disabled
                           v-model="form.yybj"
                           placeholder="请输入引用标准"
                           clearable

src/pages/processCenter/pages/creatProcess/bzrk/step4.vue

@@ -2166,6 +2166,10 @@ export default {
       // this.$refs.selections.selectAll(false)
       // }
       // this.sarBussionessLawsEO.replaceLawsNum = ''
+      this.replaceLawsNumForm = {
+        standName: '',
+        standNumber: '',
+      }
       this.replaceLawsNumModel = true
       this.replaceLawType = ''
       this.replaceLawType = type

src/pages/processCenter/pages/creatProcess/bzrk/step5.vue

@@ -3,7 +3,7 @@
     <!--        标准入库流程-->
     <ProcessHeader toggle>
       <template slot="proName">标准入库流程</template>
-      <template slot="proNode">流程数据信息</template>
+      <template slot="proNode">批准</template>
     </ProcessHeader>
     <div class="headerTabs">
       <div class="headerTabsItem" :class="active === '1' ? 'active' : ''" @click="handleTabs('1')">基础信息</div>

src/pages/processCenter/pages/phone/bzrk/step2.vue

@@ -51,8 +51,31 @@
               </el-select>
             </el-form-item>
             <van-field label="标准年份" v-model="form.standYear" readonly />
-            <van-field label="标准中文名称" v-model="form.standName" readonly />
-            <van-field label="标准英文名称" v-model="form.standEnName" readonly placeholder="请输入标准英文名称" />
+            <el-form-item label="标准中文名称" prop="standName" class="add-form-item form-item-disabled">
+              <el-tooltip v-if="form.standName" effect="dark" :content=form.standName placement="top-start">
+                <el-input
+                  v-model="form.standName"
+                  disabled
+                  placeholder="请输入标准中文名称"
+                  clearable
+                ></el-input>
+              </el-tooltip>
+              <el-input
+                v-else
+                disabled
+                v-model="form.standName"
+                placeholder="请输入标准中文名称"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+              <el-input
+                disabled
+                v-model="form.standEnName"
+                placeholder="请输入标准英文名称"
+                clearable
+              ></el-input>
+            </el-form-item>
             <el-form-item label="是否需要会签" prop="signFlag" class="add-form-item form-item-disabled">
               <el-radio-group v-model="form.signFlag" disabled>
                 <el-radio label="1">是</el-radio>
@@ -977,5 +1000,29 @@ export default {
       }
     }
   }
+  /deep/ .el-select__tags-text{
+    color: #000000 !important;
+    cursor: not-allowed !important;
+    opacity: 1 !important;
+    -webkit-text-fill-color: #000000 !important;
+    background: transparent !important;
+    font-weight: 400 !important;
+    mso-ansi-font-weight: 400 !important;
+    mso-bidi-font-weight: 400 !important;
+  }
+
+  /deep/ .el-input__inner{
+    color: #000000 !important;
+    cursor: not-allowed !important;
+    opacity: 1 !important;
+    -webkit-text-fill-color: #000000 !important;
+    background: transparent !important;
+    font-weight: 400 !important;
+    mso-ansi-font-weight: 400 !important;
+    mso-bidi-font-weight: 400 !important;
+  }
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 }
 </style>