From 93c30650d44754418e6bd1e617f7d34b79818235 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com>
Date: Fri, 17 Dec 2021 16:02:37 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=B5=81=E7=A8=8B=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/creatProcess/cywbbzzxd/step3.vue    | 303 ++++++++++++++++--
 .../pages/creatProcess/jrbzhxh/step2.vue      |  92 ++++--
 2 files changed, 341 insertions(+), 54 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
index 13a80e735..6d988ab50 100644
--- a/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
+++ b/src/pages/processCenter/pages/creatProcess/cywbbzzxd/step3.vue
@@ -37,12 +37,19 @@
                     placeholder="请输入标准编号"
                     clearable>
                   </el-input>
+                  <el-button
+                    type="primary"
+                    class="common-button-primary"
+                    size="mini"
+                    @click="showStand"
+                    style="position:absolute;top: 10px;right: 0;"
+                  >手动查找</el-button>
                 </el-form-item>
                 <el-form-item label="主持或参与" prop="hostOrTask" class="add-form-item ">
                   <div class="form-select">
                     <el-select v-model="wbbzform.hostOrTask" placeholder="请选择主持或参与">
                       <el-option
-                        v-for="item in associationOptions"
+                        v-for="item in participateOptions"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value">
@@ -81,23 +88,18 @@
                     clearable>
                   </el-input>
                 </el-form-item>
-                <el-form-item label="标准类型" prop="standType" class="add-form-item ">
-                  <div class="form-select">
-                    <el-select v-model="wbbzform.standType" placeholder="请选择标准类型">
-                      <el-option
-                        v-for="item in associationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
-                      </el-option>
-                    </el-select>
-                  </div>
+                <el-form-item label="标准类别" prop="standType" class="add-form-item ">
+                  <el-input
+                    v-model="wbbzform.standType"
+                    placeholder="请输入标准类别"
+                    clearable>
+                  </el-input>
                 </el-form-item>
                 <el-form-item label="标准制修订" prop="standRevise" class="add-form-item ">
                   <div class="form-select">
                     <el-select v-model="wbbzform.standRevise" placeholder="请选择标准制修订">
                       <el-option
-                        v-for="item in associationOptions"
+                        v-for="item in standReviseOptions"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value">
@@ -257,6 +259,134 @@
         <loading :loading="loading">流程列表加载中</loading>
       </div>
     </div>
+    <!--    添加标准抽屉-->
+    <el-drawer
+      title="添加标准"
+      :visible.sync="standModel"
+      size="900px"
+      custom-class="demo-drawer"
+    >
+      <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
+                    type="primary"
+                    class="common-button-primary"
+                    size="small"
+                    @click="getStandDataBtn">
+                    查询
+                  </el-button>
+                </el-form-item>
+                <el-form-item class="search-item btn-box">
+                  <el-button
+                    class="common-button-default"
+                    size="small"
+                    @click="clearStandSearch">清空
+                  </el-button>
+                </el-form-item>
+              </el-form>
+            </div>
+            <el-table
+              :data="standardData"
+              tooltip-effect="dark"
+              style="width: 100%"
+              border
+              ref="table"
+              class="table-height"
+              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+         fontWeight: 'bold', height: '48px'}"
+              @selection-change="selectThree"
+            >
+              <el-table-column
+                type="selection"
+                width="55"
+                align="center">
+              </el-table-column>
+              <el-table-column
+                prop="code"
+                align="center"
+                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="standName"
+                align="center"
+                label="标准名称"
+              >
+                <template slot-scope="scope">
+                  <a @click="handlePreview(scope.row)" class="table-jump">{{ scope.row.standName || scope.row.standEnName }}</a>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="issueTime"
+                align="center"
+                label="发布日期">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.issueTime ? $moment(scope.row.issueTime).format("YYYY-MM-DD") : "" }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop="XCXSSRQ"
+                align="center"
+                label="新车型实施日期">
+              </el-table-column>
+              <el-table-column
+                show-overflow-tooltip
+                prop="ZCCSSRQ"
+                align="center"
+                label="在产车实施日期">
+              </el-table-column>
+            </el-table>
+          </div>
+          <pagination
+            :page="pageNo"
+            :pageSize="pageSizeNo"
+            :total="totalNo"
+            @pageChange="pageChangeNo"
+            @pageSizeChange="pageSizeChangeNo"
+          />
+        </div>
+      </div>
+      <div class="demo-drawer-footer">
+        <el-button size="mini" @click="cancelStand">取消</el-button>
+        <el-button type="primary" size="mini" @click="okStand">添加</el-button>
+      </div>
+    </el-drawer>
     <ProcessFooter
       show-save
       show-submit
@@ -295,6 +425,31 @@ export default {
       saveLoading: false,
       loading: false,
       detailData: [],  //审批历史信息
+      standardData: [],
+      standModel: false,
+      pageNo: 1,
+      pageSizeNo: this.$store.getters.userInfo.configContent,
+      totalNo: 0,
+      //查询添加标准相关数据
+      standardSearch: {
+        standType: "",
+        standNumber: "",
+        pageNo: 1,
+        pageSizeNo: this.$store.getters.userInfo.configContent
+      },
+      standardTypeOptions: [
+        {
+          value: "INLAND",
+          label: "国内标准法规",
+          item: "INLAND"
+        },
+        {
+          value: "FOREIGN",
+          label: "海外标准法规",
+          item: "FOREIGN"
+        }
+      ],
+      standList: [],
       wbbzform: {
         reportingUnit: "",
         standNumber: "",
@@ -319,21 +474,40 @@ export default {
       //   expenses: '',
       //   costBudget:'',
       // }], //参与人表格信息
-      associationOptions: [{
-        value: "选项1",
-        label: "1"
-      }, {
-        value: "选项2",
-        label: "2"
-      }, {
-        value: "选项3",
-        label: "3"
-      }]
+      participateOptions: [
+        {
+          value: '0',
+          label: '主持'
+        },
+        {
+          value: '2',
+          label: '参与'
+        },
+        {
+          value: '3',
+          label: 'N/A'
+        },
+      ],
+      standReviseOptions: [
+        {
+          value: '制定完成',
+          label: '制定完成'
+        },
+        {
+          value: '制定中',
+          label: '制定中'
+        },
+        {
+          value: '未制定',
+          label: '未制定'
+        },
+      ],
     };
   },
   mounted() {
     this.getData();
     this.processTable();
+    this.getStandData()
   },
   methods: {
     getData() {
@@ -383,6 +557,84 @@ export default {
     foldForm() {
       this.foldFormFlag = !this.foldFormFlag;
     },
+    showStand(){
+       this.standModel = true
+    },
+    //添加标准确定事件
+    okStand(){
+      if(this.standList.length < 1){
+        this.$message.warning('请至少选择一条标准')
+      }else if(this.standList.length > 1){
+        this.$message.warning('您只能选择一条标准进行添加')
+      }else{
+        this.wbbzform.standName = this.standList[0].standName || this.standList[0].standEnName
+        this.wbbzform.standType = this.standList[0].standSort
+        this.wbbzform.standNumber = this.standList[0].standSort + '\xa0\xa0 '+ this.standList[0].standNumber
+        this.standModel = false
+      }
+
+    },
+    //添加标准取消事件
+    cancelStand() {
+      this.standModel = false;
+    },
+    typeChange(type) {
+      this.standardSearch.standType = type;
+    },
+    clearStandSearch() {
+      this.standardSearch = {
+        standType: "",
+        standNumber: ""
+      };
+      this.getStandData();
+    },
+    getStandDataBtn(){
+      this.pageNo =1;
+      this.getStandData();
+    },
+    //查询项目下的标准
+    getStandData() {
+      this.$http.get("sarStandardsInfo/sar-standards-info/getSarStandardsInfoPageByWk1", {
+        standType: this.standardSearch.standType,
+        standNumber: this.standardSearch.standNumber,
+        page: this.pageNo,
+        pageSize: this.pageSizeNo
+      }, {
+        _this: this
+      }, res => {
+        this.standardData = res.data.list;
+        this.standardData.forEach(item => {
+          this.$set(item, "ZCCSSRQ", item.zccssrq);
+          this.$set(item, "XCXSSRQ", item.xcxssrq);
+        })
+        this.totalNo = res.data.count;
+      }, e => {
+      });
+    },
+    // 点击查看
+    handlePreview(item) {
+      let routeUrl = this.$router.resolve({
+        name: "OtherStandardDetails",
+        params: {
+          id: item.id,
+          pageType: "INLAND_STAND"
+        }
+      });
+      window.open(routeUrl.href, "_blank");
+    },
+    //添加标准select的改变
+    selectThree(data) {
+      this.standList = data;
+    },
+    pageChangeNo(page) {
+      this.pageNo = page;
+      this.getStandData();
+    },
+    pageSizeChangeNo(pageSize) {
+      this.pageSizeNo = this.$store.getters.userInfo.configContent;
+      this.getStandData();
+
+    },
     handleSave() {
     },
     //不备案
@@ -520,6 +772,9 @@ export default {
       background: #E6A23C;
     }
   }
-
+  .table-height{
+    height: calc(~'100% - 65px');
+    overflow: auto;
+  }
 }
 </style>
diff --git a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
index eb2c12a78..edfd581ec 100644
--- a/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
+++ b/src/pages/processCenter/pages/creatProcess/jrbzhxh/step2.vue
@@ -33,37 +33,37 @@
                 </el-form-item>
                 <el-form-item label="协会名称" prop="associationName" class="add-form-item ">
                   <div class="form-select">
-                    <el-select v-model="wbbzform.associationName" placeholder="请选择协会名称">
+                    <el-select  @change="comityChange" v-model="wbbzform.associationName" placeholder="请选择协会名称">
                       <el-option
-                        v-for="item in associationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="item in comityOptionsOne"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
                       </el-option>
                     </el-select>
-                    <el-select v-model="wbbzform.committee" placeholder="请选择分标委">
+                    <el-select v-if="wbbzform.associationName !== ''"   @change="comityChangeOne" v-model="wbbzform.committee" placeholder="请选择分标委">
                       <el-option
-                        v-for="item in associationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="item in comityOptionsTwo"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
                       </el-option>
                     </el-select>
-                    <el-select v-model="wbbzform.workingGroup" placeholder="请选择工作组">
+                    <el-select v-if="wbbzform.associationName !== '' && wbbzform.committee !== ''"  v-model="wbbzform.workingGroup" placeholder="请选择工作组">
                       <el-option
-                        v-for="item in associationOptions"
-                        :key="item.value"
-                        :label="item.label"
-                        :value="item.value">
+                        v-for="item in comityOptionsOneThree"
+                        :key="item.id"
+                        :label="item.name"
+                        :value="item.id">
                       </el-option>
                     </el-select>
                   </div>
                 </el-form-item>
-                <el-form-item label="人员角色" prop="personnelRole" class="add-form-item ">
+                <el-form-item label="会员角色" prop="personnelRole" class="add-form-item ">
                   <div class="form-select">
                     <el-select v-model="wbbzform.personnelRole" placeholder="请选择会员角色">
                       <el-option
-                        v-for="item in associationOptions"
+                        v-for="item in comityRoleOptions"
                         :key="item.value"
                         :label="item.label"
                         :value="item.value">
@@ -122,7 +122,7 @@
           <el-table-column
             prop="workPeople"
             label="参与人"
-            width="150"
+            width="220"
             align="center">
             <template slot-scope="scope">
               <el-input  v-model="scope.row.workPeopleId" style="display: none;" readonly/>
@@ -132,6 +132,7 @@
           </el-table-column>
           <el-table-column
             prop="duties"
+            width="180"
             label="职务"
             align="center">
           </el-table-column>
@@ -149,20 +150,27 @@
           </el-table-column>
           <el-table-column
             prop="tenure"
+            width="200"
             label="任期"
             align="center">
           </el-table-column>
           <el-table-column
             prop="account"
             label="账户"
-            width="200"
+            width="300"
             align="center">
+            <template slot-scope="scope">
+                 <el-input v-model="scope.row.account" placeholder="请输入账户"></el-input>
+            </template>
           </el-table-column>
           <el-table-column
             prop="password"
             label="密码"
-            width="350"
+            width="300"
             align="center">
+            <template slot-scope="scope">
+              <el-input v-model="scope.row.password" placeholder="请输入密码"></el-input>
+            </template>
           </el-table-column>
         </el-table>
         <ProcessTitle>
@@ -349,6 +357,9 @@ export default {
       recordLoading: false,
       loading: false,
       modalshowflag: false,
+      comityOptionsOne: [],  //工作组数据
+      comityOptionsTwo: [],  //分标委数据
+      comityOptionsOneThree: [], //工作组数据
       drawerTitle: '',
       nodeList: [],
       uploadFileListPath: "api/att/attFile/upload", // 上传的地址
@@ -391,16 +402,12 @@ export default {
       associationData: [], //协会表格信息
       detailData: [], //审批历史信息
       selectedId: "",
-      associationOptions: [{
-        value: '选项1',
-        label: '1'
-      }, {
-        value: '选项2',
-        label: '2'
-      },{
-        value: '选项3',
-        label: '3'
-      }],
+      comityRoleOptions: [
+        {value: '0', label: '委员'},
+        {value: '1', label: '观察委员'},
+        {value: '2', label: '通讯委员'},
+        {value: '3', label: '成员'}
+      ],
     };
   },
   methods: {
@@ -683,8 +690,33 @@ export default {
       }
       return true;
     },
+    /** 获取分标委数据字典数据 */
+    comityChange() {
+      this.wbbzform.committee = ''
+      this.wbbzform.workingGroup = ''
+      this.comityOptionsOne.forEach(item => {
+        if (item.children !== null && item.id === this.wbbzform.associationName) {
+          this.comityOptionsTwo = item.children
+        }
+      })
+    },
+    /** 获取工作组字典数据 */
+    comityChangeOne() {
+      this.wbbzform.workingGroup = ''
+      this.comityOptionsTwo.forEach(item => {
+        if (item.children !== null && item.id === this.wbbzform.committee) {
+          this.comityOptionsOneThree = item.children
+        }
+      })
+    },
   },
   mounted() {
+    /*  获取标准法规工作组数据  */
+    this.$http.get('wg_work_group/researchData',{type:0},{
+      _this: this
+    }, res => {
+      this.comityOptionsOne = res.data.children
+    })
     this.bpnId = this.$route.query.bpnId
     if (this.bpnId !== undefined) {
       this.getDatas()