From 959ab65acd54cc5161ad636ab018b3ca88939fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Mon, 19 Jul 2021 10:57:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/bzqdfb/step1.vue       | 77 +++++++++++++++-
 .../pages/creatProcess/bzqdfb/step2.vue       | 42 ---------
 .../pages/creatProcess/bzqdfb/step3.vue       |  2 -
 .../pages/creatProcess/bzqdfb/step4.vue       |  2 -
 .../pages/creatProcess/xmpg/step1.vue         | 89 +++++++++++++++++--
 .../pages/creatProcess/xmpg/step2.vue         |  2 -
 .../pages/creatProcess/xmpg/step3.vue         |  2 -
 .../pages/creatProcess/xmpg/step4.vue         |  2 -
 .../pages/creatProcess/xmpg/step5.vue         |  2 -
 .../pages/creatProcess/xmpg/step6.vue         |  2 -
 .../pages/creatProcess/xmpg/step7.vue         |  2 -
 src/sysConfig/index.js                        |  2 +-
 12 files changed, 158 insertions(+), 68 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
index a3b48f73e..10019cd87 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue
@@ -577,6 +577,51 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+                        <div class="left">
+                          <el-form :modal="standardSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+                                            <el-form-item label="类型" class="search-item search-item-last">
+                                              <el-select
+                                                @change="typeChange"
+                                                v-model="standardSearch.standType"
+                                                placeholder="请选择"
+                                                filterable
+                                              >
+                                                <el-option
+                                                  v-for="item in standardTypeOptions"
+                                                  :value="item.value"
+                                                  :key="item.value"
+                                                  :label="item.label"
+                                                >
+                                                </el-option>
+                                              </el-select>
+                                            </el-form-item>
+                            <el-form-item label="标准号/标准名称" class="search-item search-item-last">
+                              <el-input
+                                v-model="standardSearch.standNumber"
+                                placeholder="请输入标准号或标准名称"
+                              ></el-input>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
+                              <el-button
+                                :loading="searching"
+                                type="primary"
+                                class="common-button-primary"
+                                size="small"
+                                v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                                @click="addList">
+                                查询
+                              </el-button>
+                            </el-form-item>
+                            <el-form-item class="search-item btn-box">
+                              <el-button
+                                class="common-button-default"
+                                size="small"
+                                v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                                @click="clearSearch">清空
+                              </el-button>
+                            </el-form-item>
+                          </el-form>
+                        </div>
             <el-table
               :data="standardData"
               tooltip-effect="dark"
@@ -729,13 +774,20 @@ export default {
       fileUrl: 'api/att/attFile/upload',
       fileMadel: false,
       searching: false,
-      // 查询相关参数
+      // 查询选择清单相关参数
       sarSarAccessEOSearch: {
         countryArea: "",
         detailedListName: "",
         page: 1,
         pageSize: this.$store.getters.userInfo.configContent
       },
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: '',
+        standNumber:'',
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+    },
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
@@ -823,6 +875,18 @@ export default {
       },
       choiceForm: {}, //选择标准清单列表
       countryOptions: [], //适用区域下拉框数据
+      standardTypeOptions: [
+        {
+          value: 'INLAND',
+        label: '国内标准法规',
+        item:'INLAND',
+      },
+        {
+          value: 'FOREIGN',
+          label: '海外标准法规',
+          item:'FOREIGN',
+        },
+      ],
       user1: "",
       user2: "",
       user3: "",
@@ -878,7 +942,6 @@ export default {
     // //判断当前选中的是哪个清单
     selectionList(type) {
       type  = this.listType
-      console.log(type);
       if (type === "project") {
         this.$http.get("sarLawsDetailedList/sar-laws-detailed-list/getAllStand", {
           page: this.page,
@@ -925,11 +988,18 @@ export default {
         countryArea: "",
         detailedListName: ""
       };
+      this.standardSearch ={
+        standType:'',
+        standNumber: '',
+      }
       this.selectionList();
+      this.addList()
     },
     //点击添加事件
     addList() {
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
         page: this.pageNo,
         pageSize: this.pageSizeNo
       }, {
@@ -1126,6 +1196,9 @@ export default {
     closeDrawer() {
       this.ListModel = false;
     },
+    typeChange(type) {
+      this.standardSearch.standType = type
+    },
     //添加标准取消事件
     cancelStand() {
       this.standModel = false;
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
index af82808bd..3ed3e478d 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue
@@ -135,46 +135,6 @@
         </el-collapse>
       </div>
     </div>
-    <div class="content" v-show="active == '2'">
-      <div class="block" style="padding-top: 20px;">
-        <el-timeline>
-          <el-timeline-item timestamp="发起流程" placement="top" :color="user1 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>标准/政策法规工程师</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user1" placeholder="请输入"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="选择责任人进行会签" placement="top" :color="user2 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>责任人</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user2" placeholder="请输入">
-
-                </el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="根据会签内容进行修订" placement="top" :color="user3 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>标准/政策法规工程师</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user3" placeholder="请输入"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-          <el-timeline-item timestamp="审核" placement="top" :color="user5 ? '#66b1ff' : ''">
-            <el-card>
-              <h4>业务经理</h4>
-              <div style="margin-top: 10px;">
-                <el-input v-model="user5" placeholder="请输入"></el-input>
-              </div>
-            </el-card>
-          </el-timeline-item>
-        </el-timeline>
-      </div>
-    </div>
     <div class="content" v-show="active === '3'">
       <div class="flow-list">
         <el-table
@@ -197,14 +157,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
index 691b0232f..117d4f100 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue
@@ -161,14 +161,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
index d46cac82e..7f7e47680 100644
--- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue
@@ -158,14 +158,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
index 9fc9873bc..2b2e53f35 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step1.vue
@@ -65,7 +65,7 @@
         <div class="tableTitle">
           <div class="tableButton">
             <el-button plain class="common-button-primary" size="mini" @click="addList">新增</el-button>
-            <el-button plain class="common-button-primary" size="mini" @click="addList">批量删除</el-button>
+            <el-button plain class="common-button-primary" size="mini" @click="deleteList">批量删除</el-button>
           </div>
         </div>
         <el-table
@@ -163,6 +163,41 @@
       <div class="demo-drawer-content">
         <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
           <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+<!--            <div class="left">-->
+<!--              <el-form :modal="sarSarAccessEOSearch" :inline="true" class="label-input-form" style="margin-left:10px">-->
+<!--                <el-form-item label="标准号" class="search-item search-item-last">-->
+<!--                  <el-input-->
+<!--                    v-model="sarSarAccessEOSearch.standName"-->
+<!--                    placeholder="请输入标准号"-->
+<!--                  ></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item label="标准名称" class="search-item search-item-last">-->
+<!--                  <el-input-->
+<!--                    v-model="sarSarAccessEOSearch.standNumber"-->
+<!--                    placeholder="请输入标准名称"-->
+<!--                  ></el-input>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item class="search-item btn-box">-->
+<!--                  <el-button-->
+<!--                    :loading="searching"-->
+<!--                    type="primary"-->
+<!--                    class="common-button-primary"-->
+<!--                    size="small"-->
+<!--                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"-->
+<!--                    @click="getStandData">-->
+<!--                    查询-->
+<!--                  </el-button>-->
+<!--                </el-form-item>-->
+<!--                <el-form-item class="search-item btn-box">-->
+<!--                  <el-button-->
+<!--                    class="common-button-default"-->
+<!--                    size="small"-->
+<!--                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"-->
+<!--                    @click="clearSearch">清空-->
+<!--                  </el-button>-->
+<!--                </el-form-item>-->
+<!--              </el-form>-->
+<!--            </div>-->
             <el-table
               :data="sarAccessListDatas"
               tooltip-effect="dark"
@@ -344,6 +379,14 @@ export default {
       standList: [], //新添加的标准
       modalshowflag: false, // drawer开关
       drawerTitle: "", //drawer标题
+      // 查询相关参数
+      searching: false,
+      sarSarAccessEOSearch: {
+        standName:'',
+        standNumber:'',
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent
+      },
       nodeList: [],
       defaultProps: {
         children: "children",
@@ -386,6 +429,7 @@ export default {
       },
       ListModel: false, //选择拆分标准抽屉状态
       treeData: [], // 人员数据
+      selectList: [], //选择标准的选择框
       isSubmit: false,
       saveLoading: false,
       selectedList: [],  //拆分标准的选择框
@@ -497,6 +541,32 @@ export default {
     addList() {
       this.standModel = true;
     },
+    // 点击批量删除事件
+    deleteList() {
+      console.log(this.selectList.length);
+       if(this.selectList.length < 1){
+         this.$message.warning('请选择一条数据进行删除')
+       }else {
+          this.$confirm('您确认删除这些数据？', '提示', {
+            confirmButtonText: "确认",
+            confirmButtonClass: "common-button-primary",
+            cancelButtonText: "取消",
+            type: "warning"
+          }). then(() => {
+            this.selectList.map(item => {
+              let index;
+            index =  this.dataList.findIndex(items => {
+                return items.productLine = item
+              })
+              if (index > -1) {
+                this.dataList.splice(index, 1);
+              }
+            });
+            this.selectList = [];
+          }).catch(() => {
+          })
+       }
+    },
     //取消添加事件
     cancelStand() {
       this.standModel = false;
@@ -590,6 +660,7 @@ export default {
         }, {
           _this: this
         }, res => {
+          console.log(res.data);
           this.listForm.breakdownList = res.data;
           this.ListModel = false;
         }, e => {
@@ -609,7 +680,7 @@ export default {
     selectStandChange(data) {
       this.selectList = [];
       for (let i = 0; i < data.length; i++) {
-        this.selectList.push(data[i].id);
+        this.selectList.push(data[i].productLine);
       }
     },
     //添加产品线select的改变
@@ -655,7 +726,7 @@ export default {
       }, {
         _this: this
       }, res => {
-        this.productData = res.data;
+        this.productData = res.data.records;
         this.totalNo = res.data.total;
       }, e => {
 
@@ -663,20 +734,24 @@ export default {
     },
     //获取标准数据
     getStandData() {
-      console.log(this.page);
-      console.log(this.pageSize);
       this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage", {
         page: this.page,
         pageSize: this.pageSize,
       }, {
         _this: this
       }, res => {
-        console.log(res.data);
         this.sarAccessListDatas = res.data.list;
         this.total = res.data.count;
       }, e => {
       });
-    }
+    },
+    clearSearch() {
+      this.sarSarAccessEOSearch = {
+        standName: "",
+        standNumber: ""
+      };
+      this.getStandData();
+    },
   },
   computed: {},
   mounted() {
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
index d9e41a3e0..5d6473957 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step2.vue
@@ -132,14 +132,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
index 1062dcb4d..bb12060ab 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step3.vue
@@ -177,14 +177,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
index ac5dba73c..98ac84365 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step4.vue
@@ -286,14 +286,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
index d9b691b9c..f335d5fbd 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5.vue
@@ -243,14 +243,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
index b7ef99fb3..e31352c56 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step6.vue
@@ -243,14 +243,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
index 58902008e..f0c0aa06c 100644
--- a/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
+++ b/src/pages/processCenter/pages/creatProcess/xmpg/step7.vue
@@ -243,14 +243,12 @@
             prop="name"
             label="任务步骤"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
             prop="assignee"
             label="任务受理人"
             align="center"
-            sortable="custom"
           >
           </el-table-column>
           <el-table-column
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js
index 192b22819..2f49323fa 100644
--- a/src/sysConfig/index.js
+++ b/src/sysConfig/index.js
@@ -7,7 +7,7 @@
 // const devIp = '39.98.140.126'
 // const devInterfacePORT = '10005'
 // const devIp = '192.168.10.248'
-const devIp = '192.168.10.254'
+const devIp = '192.168.1.108'
 const devInterfacePORT = '9999'
 // 云端端口号
 const DEV_CLOUD_RES_INTERFACE_PORT = '7777'