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

public/index.html

@@ -9,6 +9,7 @@
     <meta http-equiv="Cache-Control" content="no-cache, must-revalidate">
     <meta http-equiv="expires" content="0">
     <title>标准法规管理系统</title>
+    <script src="static/polyfill/proxy.min.js"></script>
     <style>
       .logo {
         position: absolute;
@@ -24,8 +25,8 @@
         width: 100%;
         height: 100%;
         background: url("static/images/BG.png");
-        background-size: 100% 100%;  //
+        background-size: 100% 100%;
-        background-repeat: no-repeat;  //
+        background-repeat: no-repeat;
         background-attachment: fixed;
       }
       #headerId {margin:0;}
@@ -33,7 +34,6 @@
       .inner-header {height:65vh;width:100%;margin:0;padding:0;}
       .flex {display:flex;flex-direction:column;justify-content:center;align-items:center;text-align:center;}
     </style>
-    <script src="static/polyfill/proxy.min.js"></script>
     <!--     vconsole调试工具-->
 <!--    <script src="https://cdn.bootcss.com/vConsole/3.3.4/vconsole.min.js"></script>-->
 <!--    <script type="text/javascript">-->

src/pages/personal/pages/my-questions/index.vue

@@ -19,7 +19,7 @@
          <el-button size="mini"  @click="delSearch">清空</el-button>
        </el-form-item>
        <el-form-item>
-         <el-button size="mini" type="primary" @click="queBtn">提问</el-button>
+         <el-button v-if="activeName === 'myQue'" size="mini" type="primary" @click="queBtn">提问</el-button>
        </el-form-item>
      </el-form>
    </div>

src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue

@@ -22,7 +22,7 @@
                 <template style="width: 10%">
                     <el-table
                             :data="historyData"
-                            height="250"
+                            :height="tablePHeight"
                             border
                             :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
                             style="width: 10%;float: left;margin-right: 20px;">
@@ -32,7 +32,7 @@
                                 label="质量评价人"
                                 min-width="100%">
                             <template slot-scope="scope">
-                                <div @click="ccc(scope.row)">{{scope.row.userName}}-{{scope.row.taskInfo}}</div>
+                                <div @click="ccc(scope.row)" style="cursor: pointer">{{scope.row.userName}}-{{scope.row.taskInfo}}</div>
                             </template>
                         </el-table-column>
                     </el-table>

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

@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -220,13 +221,14 @@ export default {
       })
     },
     assemble(ids,names){
-      let list= new Array();
+      let list= [];
-      let idArray=ids.split(',');
+      if(ids && ids !== '' && names && names !== ''){
-      let nameArray=names.split(',');
+        let idArray=ids.split(',');
-      for(let i=0; i<idArray.length; i++){
+        let nameArray=names.split(',');
-        list.push({id:idArray[i],name:nameArray[i]});
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
       }
-
       return list;
     },
     handleTabs(name){

src/pages/processCenter/pages/phone/qbzxdjhgk/step3.vue

@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -219,6 +220,17 @@ export default {
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },

src/pages/processCenter/pages/phone/qbzxdjhgk/step4.vue

@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -218,6 +219,17 @@ export default {
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },

src/pages/processCenter/pages/phone/qbzxdjhgk/step5.vue

@@ -127,6 +127,7 @@ export default {
       type: '',
       commentText: '',
       qbfsForm: {},
+      LXDList:[],
       isTransfer: false,
       isSubmit: false,
       saveLoading: false,
@@ -218,6 +219,17 @@ export default {
         this.LXDList=this.assemble(this.qbfsForm.LXD,this.qbfsForm.LXDName);
       })
     },
+    assemble(ids,names){
+      let list= [];
+      if(ids && ids !== '' && names && names !== ''){
+        let idArray=ids.split(',');
+        let nameArray=names.split(',');
+        for(let i=0; i<idArray.length; i++){
+          list.push({id:idArray[i],name:nameArray[i]});
+        }
+      }
+      return list;
+    },
     handleTabs(name){
       this.active = name
     },
@@ -267,7 +279,9 @@ export default {
       this.isSubmit = true
       this.qbfsForm.bzfgbzFlag = '0'
       this.qbfsForm.planStatus = '未开始'
-      this.qbfsForm.area = this.qbfsForm.area.join(',')
+      if(this.qbfsForm.area && this.qbfsForm.length > 0){
+        this.qbfsForm.area = this.qbfsForm.area.join(',')
+      }
       this.qbfsForm.commentText = this.commentText
       let json = JSON.stringify(this.qbfsForm);
       this.$http.post('lawss/activiti/completeTask', {

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

@@ -1728,7 +1728,7 @@ export default {
         {value: 'buss1_2',label: '技术标准-修订'},
         {value: 'buss2_1',label: '产品标准-制定'},
         {value: 'buss2_2',label: '产品标准-修订'},
-        {value: 'buss2_3',label: '产品标准-修订'},
+        {value: 'buss2_3',label: '产品标准-修改'},
       ],
       QCBFC: false,  //C类标准展示备案日期
       replaceLawsNumModel: false,
@@ -2425,7 +2425,7 @@ export default {
       nodeList3: [],
       nodeListZRBM: [],
       modalshowflagZRBM: false,
-      addOrUPdateFlag: 1, // 新增：1， 修改：2
+      addOrUPdateFlag: 2, // 新增：1， 修改：2
       modalshowflag: false,
       standSubclassConfigOptions: [], // 企标细类下拉框-所有数据
       collectBtn: false,