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

src/pages/home2/components/todoList/index.vue

@@ -514,7 +514,7 @@ export default {
           }
           break;
         case '3':
-          if (row.taskInfo === '责任部门对接人选择责任人') {
+          if (row.taskInfo === '任务分发') {
             this.$router.push({
               name: 'bzzqyjStep2',
               query: {
@@ -525,7 +525,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '责任人反馈'){
+          } else if (row.taskInfo === '意见反馈'){
             this.$router.push({
               name: 'bzzqyjStep3',
               query: {
@@ -536,7 +536,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '责任部门对接人汇总并选择审批人') {
+          } else if (row.taskInfo === '意见汇总报批') {
             this.$router.push({
               name: 'bzzqyjStep4',
               query: {
@@ -547,7 +547,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '审批人审批') {
+          } else if (row.taskInfo === '意见审批（经理、研发副总裁）') {
             this.$router.push({
               name: 'bzzqyjStep4-1',
               query: {
@@ -558,7 +558,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '标准法规工程师分线审核') {
+          } else if (row.taskInfo === '管理员（起草节点一个人）') {
             this.$router.push({
               name: 'bzzqyjStep4-2',
               query: {
@@ -569,7 +569,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '标准法规工程师汇总') {
+          } else if (row.taskInfo === '意见处理') {
             this.$router.push({
               name: 'bzzqyjStep5',
               query: {
@@ -580,7 +580,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '责任人会签') {
+          } else if (row.taskInfo === '会签（选择会签人部长）') {
             this.$router.push({
               name: 'bzzqyjStep6',
               query: {
@@ -591,7 +591,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '部长+对接人审核') {
+          } else if (row.taskInfo === '审核（李部、会签人部长）') {
             this.$router.push({
               name: 'bzzqyjStep7',
               query: {
@@ -602,7 +602,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '技术委员会相关专委会主任/研究总院职能部门领导，技术管理中心主任审定' ) {
+          } else if (row.taskInfo === '审定（阚主任、技术委员会相关专委会主任/研究总院职能部门领导）' ) {
             this.$router.push({
               name: 'bzzqyjStep8',
               query: {
@@ -613,7 +613,7 @@ export default {
                 prcType: row.prcType
               }
             })
-          } else if (row.taskInfo === '工程研究总院院长批准') {
+          } else if (row.taskInfo === '批准（工程研究总院院长批准、标准法规主管副院长）') {
             this.$router.push({
               name: 'bzzqyjStep9',
               query: {

src/pages/processCenter/pages/components/ProcessFooter.vue

@@ -59,7 +59,6 @@
               v-if="showOver"
       >撤销申请</el-button>
       <el-button
-              type="primary"
               size="small"
               class="common-button-primary"
               icon="el-icon-s-promotion"

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

@@ -1715,8 +1715,9 @@ export default {
     filterText(val) {
       this.$refs.tree.filter(val);
     },
-    'form.standInData' : {
+    'form' : {
       handler: function () {
+        console.log(this.form.standInData)
         if(this.form.standInData === '1') {
           this.rules.standYear[0].required = false;
           this.rules.standName[0].required = false

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

@@ -44,7 +44,7 @@
                 </el-form-item>
 
 
-                <el-form-item  v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
+                <el-form-item  label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standSort" filterable placeholder="请选择标准类别">
                     <el-option
                         v-for="item in standSortOptions"
@@ -127,7 +127,7 @@
                   </el-radio-group>
                   <el-button @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
-                <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
+                <el-form-item v-show="form.standInData=='0'" label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-input v-model="form.standSystem" placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
                   <tree-select-new
                           :key="key"
@@ -2661,7 +2661,7 @@ export default {
         }
       }
     },
-    'form.standInData' : {
+    'form' : {
       handler: function () {
         if(this.form.standInData === '1') {
           this.rules.standYear[0].required = false;
@@ -2672,11 +2672,6 @@ export default {
         }
       }
     },
-    form(val){
-      if(this.form){
-
-      }
-    }
   }
 }
 </script>

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/details.vue

@@ -62,7 +62,7 @@
           </el-form-item>
           <el-form-item label="责任部门" class="search-item" prop="responseUnit">
             <el-input
-              v-model="standardForm.responseUnit"
+              v-model="standardForm.zrbm"
               placeholder="请输入责任部门"
             >
             </el-input>
@@ -284,20 +284,11 @@
             </el-select>
           </el-form-item>
           <el-form-item label="责任部门">
-            <el-select
+            <el-input
-              class="showBox"
+              v-model="standardForm.zrbm"
-              v-model="standardFormList.zrbm"
+              placeholder="请输入责任部门"
-              placeholder="请选择"
-              filterable
-              size="small"
             >
-              <el-option
+            </el-input>
-                v-for="item in zrbmOptions"
-                :value="item.value"
-                :key="item.value"
-                :label="item.label"
-              />
-            </el-select>
           </el-form-item>
           <el-form-item label="适用产品线">
             <el-select
@@ -668,11 +659,11 @@ export default {
     },
     pageChange(page) {
       this.standardForm.page = page;
-      // this.selectInfobyAccid();
+      this.selectInfobyAccid();
     },
     pageSizeChange(pageSize) {
       this.standardForm.Size = this.$store.getters.userInfo.configContent;
-      // this.selectInfobyAccid();
+      this.selectInfobyAccid();
     },
     // 请求部门结构树
     getOrgTreeSource() {

src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue

@@ -3305,7 +3305,7 @@ export default {
                 if (nowstandinfo.firstPutTime != null && nowstandinfo.firstPutTime !== '') {
                   nowstandinfo.firstPutTime = this.$dateFormat(this.sarBussionessStandEO.firstPutTime, 'yyyy-MM-dd hh:mm:ss')
                 }
-                nowstandinfo.standCode = nowstandinfo.standSort + ' ' + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
+                nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + ( nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear)
                 this.$http.postData('lawss/sarBussionessStand/updateSarBussionessStand', nowstandinfo, {
                   _this: this,
                   loading: 'isSubmit'