From 7c7ef0c56cb5c49913434434626ec65bfa2dfc64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Thu, 8 Jul 2021 21:08:08 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/xmpg/step1.vue         | 141 +++++++-----------
 .../pages/addEdit.vue                         |  12 +-
 src/sysConfig/index.js                        |   4 +-
 3 files changed, 62 insertions(+), 95 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 0bdf9b2ad..a69694b6d 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -70,15 +70,17 @@
             label="产品线">
           </el-table-column>
           <el-table-column
-            prop="cpxzrr"
+            prop="projectManager"
             label="产品线责任人">
           </el-table-column>
           <el-table-column
-            prop="ffzrr"
+            prop="ministerUser"
             label="分发责任人">
             <template>
               <el-input
                 placeholder="请选择分发责任人"
+                v-model="ffzrr"
+                @click.native="choiceZRR('ministerUser', '请选择分发责任人', roleForm.ministerUser)"
               >
               </el-input>
             </template>
@@ -173,64 +175,36 @@
                 align="center">
               </el-table-column>
               <el-table-column
-                prop="detailedList"
-                label="清单类别"
-                align="center">
+                prop="code"
+                fixed="left"
+                label="标准号">
+                <template slot-scope="scope">
+                  <a v-if="scope.row.standYear" class="table-jump" @click="handlePreview(scope.row)">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}-{{ scope.row.standYear }}</a>
+                  <a v-else @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standSortShow }} {{ scope.row.standNumber }}</a>
+                </template>
               </el-table-column>
               <el-table-column
-                prop="detailedListName"
-                label="清单名称"
-                align="center"
+                prop="standName"
+                label="标准名称"
               >
-                <template slot-scope="scope">
-                  <a class="table-jump" @click.stop="showTable(scope.row)">{{ scope.row.detailedListName }}</a>
-                </template>
               </el-table-column>
               <el-table-column
-                prop="detailedListState"
-                label="清单状态"
-                align="center">
-                <template slot-scope="scope">
-                  <span v-if="scope.row.detailedListState === '1'">未发布</span>
-                  <span v-if="scope.row.detailedListState === '2'">已发布</span>
-                </template>
+                prop="issueTime"
+                label="发布日期">
               </el-table-column>
               <el-table-column
-                prop="detailedListVision"
-                label="清单版本"
-                align="center">
-                <template slot-scope="scope">
-            <span
-              v-if="scope.row.detailedListVision != null && scope.row.detailedListVision !== ''">{{ scope.row.detailedListVision
-              }}</span>
-                </template>
+                prop="xcxssrq"
+                label="新车型实施日期">
               </el-table-column>
               <el-table-column
-                prop="applicationScope"
-                label="适用领域"
-                align="center">
-                <template slot-scope="scope">
-            <span
-              v-if="scope.row.applicationScope != null && scope.row.applicationScope !== ''">{{ scope.row.applicationScope
-              }}</span>
-                </template>
+                show-overflow-tooltip
+                prop="zccssrq"
+                label="在产车实施日期">
               </el-table-column>
               <el-table-column
-                prop="updateTime"
-                label="更新时间"
-                sortable
-                align="center">
-                <template slot-scope="scope">
-                  <div>
-                    {{ scope.row.updateTime ? $moment(scope.row.updateTime).format("YYYY-MM-DD hh:mm:ss") : scope.row.updateTime
-                    }}
-                  </div>
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop="updatePeople"
-                label="更新人"
-                align="center">
+                show-overflow-tooltip
+                prop="textStatus"
+                label="文本状态">
               </el-table-column>
             </el-table>
           </div>
@@ -355,6 +329,7 @@ export default {
   },
   data() {
     return {
+      ffzrr:'',
       active: "1",
       standModel: false,
       sarAccessListDatas: [],
@@ -416,13 +391,11 @@ export default {
         standNumber: "", //标准编号
         standName: "",//标准名称
         dataList: [{
-          code: "", //标准号
-          standName: "", //标准名称
-          issueTime: "", //发布日期
-          xcxssrq: "", //新车型实施日期
-          zccssrq: "", //在产车实施日期
-          textStatus: "", //文本状态
-          id: ""
+          projectLine: '', //产品线
+          projectManager:'',//产品线责任人
+          ffzrr: '', //分发责任人
+          id: "",
+          sarStandProjectLibraries: [],
         }]
       },
       choiceForm: {}, //选择标准清单列表
@@ -479,15 +452,8 @@ export default {
     //确认添加事件
     okStand() {
       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.dataList = this.standList
+        this.listForm.dataList = this.standList
         this.standModel = false
       }else{
         this.$message.warning('请选择一条数据进行添加')
@@ -526,11 +492,7 @@ export default {
       json.prcCreateUserName = this.$store.getters.userInfo.account;
       json.standName = this.listForm.listName;
       json.standId = this.listForm.standId;
-      this.$refs["qdfbForm"].validate((valid) => {
-        if (valid) {
-          this.$refs["Form"].validate((valid) => {
-            if (valid) {
-              this.$http.get("lawss/activiti/startProcess", { type: "4" }, {
+              this.$http.get("lawss/activiti/startProcess", { type: "5" }, {
                 _this: this
               }, res => {
                 if (res.ok) {
@@ -548,14 +510,6 @@ export default {
                   });
                 }
               });
-            } else {
-              return this.$message.warning("请完善人员信息");
-            }
-          });
-        } else {
-          return this.$message.warning("请完善基础信息");
-        }
-      });
     },
     //选择拆分标准取消事件
     closeDrawer() {
@@ -564,13 +518,19 @@ export default {
 
     //选择拆分标准确定事件
     OkDrawer() {
+      if(this.selectedList.length == 1){
+        this.listForm.standNumber  = this.selectedList[0].standNumber
+        this.listForm.standName  = this.selectedList[0].standName
+        this.ListModel = false
+      }else if(this.selectedList.length > 1){
+        this.$message.warning('您只能选择一条数据进行带入')
+      }else{
+        this.$message.warning('请选择一条数据带入')
+      }
     },
     //选择拆分标准选择框改变
     selectListChange(data) {
-      this.selectedList = [];
-      for (let i = 0; i < data.length; i++) {
-        this.selectedList.push(data[i].id);
-      }
+      this.selectedList = data;
     },
     //标准表格选择框改变
     selectStandChange(data) {
@@ -581,10 +541,7 @@ export default {
     },
     //添加产品线select的改变
     selectThree(data) {
-      this.standList = [];
-      for(let i=0;i<data.length; i++){
-        this.standList.push(data[i].id)
-      }
+      this.standList = data;
     },
     choiceZRR(type, title, id) {
       this.nodeList = [];
@@ -616,15 +573,27 @@ export default {
         _this: this
       }, res => {
         this.productData = res.data
+        // this.totalNo = res.data
       }, e => {
 
       })
     },
+    //获取标准数据
+    getStandData() {
+      this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage','',{
+        _this: this
+      }, res => {
+        this. sarAccessListDatas = res.data.list
+        this.total = res.pageCount
+      }, e => {
+      })
+    },
   },
   computed: {},
   mounted() {
     this.getTree();
     this.getProductData()
+    this.getStandData()
   }
 
 };
diff --git a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
index e839c14a9..5289fa24e 100644
--- a/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
+++ b/src/pages/regulatoryRepository/accessStandardsAndRegulations/pages/addEdit.vue
@@ -1120,12 +1120,12 @@ export default {
         }
     },
     // 清单条目 table select事件
-    sarAccessInfoSelect (data) {
-      let sarAccessInfoListArry =  [];
-      for(let i = 0; i< data.length; i++){
-        this.sarAccessInfoListArry.push(data[i].id)
+    sarAccessInfoSelect (selectData) {
+      this.sarAccessInfoListArry = selectData
+      let sarAccessInfoListArryId =  []
+      for(let i=0; i<this.selectData.length; i++){
+
       }
-      console.log(this.sarAccessInfoListArry);
     },
     // 点击取消按钮 返回事件
     backCancal () {
@@ -1196,8 +1196,6 @@ export default {
         _this: this
       }, res =>{
         this.sarAccessInfoSearchList = res.data.list
-        this.$nextTick(() => {
-        })
       }, e => {
 
       })
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 39134bcc1..a15aed4fa 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -6,8 +6,8 @@
 // 服务器地址
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
-const devIp = '192.168.10.121'
-const devInterfacePORT = '9988'
+const devIp = '192.168.10.248'
+const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'
 const simpleFilePath = 'att/attFile/upload'