commit

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

@@ -978,6 +978,7 @@ export default {
       for (let i = 0; i < data.length; i++) {
         this.selectedList.push(data[i].id);
       }
+      console.log(this.selectedList);
     },
     //标准表格选择框改变
     selectStandChange(data) {

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

@@ -76,7 +76,12 @@
           <el-table-column
             prop="ffzrr"
             label="分发责任人">
-
+            <template>
+              <el-input
+                placeholder="请选择分发责任人"
+              >
+              </el-input>
+            </template>
           </el-table-column>
         </el-table>
       </div>
@@ -270,12 +275,12 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="issueTime"
+                prop="productLine"
                 label="产品线">
               </el-table-column>
               <el-table-column
                 show-overflow-tooltip
-                prop="textStatus"
+                prop="projectManager"
                 label="产品线责任人">
               </el-table-column>
             </el-table>
@@ -399,32 +404,14 @@ export default {
       isSubmit: false,
       saveLoading: false,
       selectedList: [],  //拆分标准的选择框
-      dataList:[
+      dataList:[],
-        {
-          id: 1,
-          productLine: '风景线',
-          cpxzrr: '李四',
-          ffzrr: '张三',
-        },
-        {
-          id: 2,
-          productLine: '风景线',
-          cpxzrr: '李四',
-          ffzrr: '张三',
-        }, {
-          id: 3,
-          productLine: '风景线',
-          cpxzrr: '李四',
-          ffzrr: '张三',
-        },
-
-      ],
       page: 1,
       total: 0,
       pageSize: this.$store.getters.userInfo.configContent,
       pageNo: 1,
       totalNo: 0,
       pageSizeNo: this.$store.getters.userInfo.configContent,
+      product: new Map(),
       listForm: {
         standNumber: "", //标准编号
         standName: "",//标准名称
@@ -491,7 +478,20 @@ export default {
     },
     //确认添加事件
     okStand() {
-      this.standModel = false
+      if(this.standList.length >= 1){
+        let deposit = new Map();
+        this.sarAccessListDatas.forEach(item => {
+          deposit.set(item.id, item);
+        });
+        let bringData = [];
+        for (let i = 0; i < this.standList.length; i++) {
+          bringData.push(deposit.get(this.standList[i]));
+        }
+        console.log(bringData);
+        this.standModel = false
+      }else{
+        this.$message.warning('请选择一条数据进行添加')
+      }
     },
     //保存事件
     handleSave() {
@@ -581,7 +581,10 @@ export default {
     },
     //添加产品线select的改变
     selectThree(data) {
-      this.standList = data;
+      this.standList = [];
+      for(let i=0;i<data.length; i++){
+        this.standList.push(data[i].id)
+      }
     },
     choiceZRR(type, title, id) {
       this.nodeList = [];
@@ -607,10 +610,21 @@ export default {
     pageSizeChangeNo(pageSize) {
       this.pageSizeNo = this.$store.getters.userInfo.configContent;
     },
+    //获取产品线数据
+    getProductData() {
+      this.$http.get('sarStandProjectLibrary/queryProjectManager','',{
+        _this: this
+      }, res => {
+        this.productData = res.data
+      }, e => {
+
+      })
+    },
   },
   computed: {},
   mounted() {
     this.getTree();
+    this.getProductData()
   }
 
 };

src/pages/processCenter/pages/newProcess/index.vue

@@ -11,7 +11,7 @@
         <div class="process-name" @click="handleCreateProcess('5')">标准发放申请流程</div>
         <div class="process-name" @click="handleCreateProcess('6')">标准清单发布/更新流程</div>
         <div class="process-name" @click="handleCreateProcess('7')">项目合规评估流程</div>
-        <div class="process-name" @click="handleCreateProcess('7')">未符合项整改流程</div>
+        <div class="process-name" @click="handleCreateProcess('8')">未符合项整改流程</div>
       </div>
     </div>
     <div v-if="zcgllc">
@@ -88,7 +88,7 @@ export default {
         case '7':
           //项目评估流程
           this.$router.push({
-            name:'xmpgStep1'
+            name: 'xmpgStep1'
           })
           break
         case '8':

src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue

@@ -1015,6 +1015,7 @@ export default {
               this.sarAccessInfoList.push(item)
             )
           })
+          this.selectedAccInfoSearchList = []
           this.$refs.entryTable.clearSelection()
           this.$refs.searchTable.clearSelection()
         } else {
@@ -1119,8 +1120,12 @@ export default {
         }
     },
     // 清单条目 table select事件
-    sarAccessInfoSelect (selectData) {
+    sarAccessInfoSelect (data) {
-      this.sarAccessInfoListArry = selectData
+      let sarAccessInfoListArry =  [];
+      for(let i = 0; i< data.length; i++){
+        this.sarAccessInfoListArry.push(data[i].id)
+      }
+      console.log(this.sarAccessInfoListArry);
     },
     // 点击取消按钮 返回事件
     backCancal () {

src/pages/regulatoryRepository/enterBSysRevPlanManaLib/index.vue

@@ -3,7 +3,7 @@
   <div id="enterBSysRevPlanManaLib" class="v-class">
     <div class="search-area">
       <div class="left">
-        <el-form :modal="condition" :inline="true" class="label-input-form"  @keyup.enter.native="handleSearchByCondition">
+        <el-form :modal="condition" :inline="true" class="lab-form"  @keyup.enter.native="handleSearchByCondition">
           <el-form-item label="计划状态" class="search-item">
             <el-select
               v-model="condition.planStatus"

src/router/index.js

@@ -276,15 +276,6 @@ const routes = [
           title: '标准清单发布/更新流程'
         }
       },
-      {
-        path: '/wfhxzgStep1',
-        name: 'wfhxzgStep1',
-        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'),
-        meta: {
-          requireAuth: true,
-          title: '未符合项整改流程'
-        }
-      },
       {
         path: '/xmpgStep1',
         name: 'xmpgStep1',
@@ -294,6 +285,15 @@ const routes = [
           title: '项目合规评估流程'
         }
       },
+      {
+        path: '/wfhxzgStep1',
+        name: 'wfhxzgStep2',
+        component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue'),
+        meta: {
+          requireAuth: true,
+          title: '未符合项整改发布/更新流程'
+        }
+      },
       {
         path: '/wfhxzgStep2',
         name: 'wfhxzgStep2',

src/sysConfig/index.js

@@ -6,8 +6,8 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.248'
+const devIp = '192.168.10.121'
-const devInterfacePORT = '9999'
+const devInterfacePORT = '9988'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'
@@ -51,4 +51,4 @@ module.exports = {
     enterprise: enterprise, // GQ广汽 SJZX数据中心
     theme: theme, // 主题
     processInterfaceURL: `http://${serverIP}:${processPort}/bat-wkflow`
-}
+}