From d5e61148148a328aa78ae50fa9a2a300c668c537 Mon Sep 17 00:00:00 2001
From: zhangyichen <5277314+zacty@user.noreply.gitee.com>
Date: Tue, 12 Apr 2022 17:39:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=20?=
 =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E4=BA=BA=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../creatProcess/zdrzbzORzchgxxmsc/step5.vue  |  1 +
 .../nonConfomity/pages/productDepartment.vue  | 87 ++++++++-----------
 2 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
index bc4b076e7..0a52064f1 100644
--- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
+++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step5.vue
@@ -1190,6 +1190,7 @@ export default {
           var json = this.json;
           json.infoTableDatas = infoTableDatas
           json.table = this.ruleForm.multipleTableData
+          json.zerenren = this.$store.getters.userInfo.userId
           json.commentText = this.commentText;
           json.responUserList = this.form.responUserList;
           json.responUserListName = this.form.responUserListName;
diff --git a/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue b/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
index df3744398..1cf4fc174 100644
--- a/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
+++ b/src/pages/regulatoryRepository/nonConfomity/pages/productDepartment.vue
@@ -10,41 +10,13 @@
                     clearable
                     :maxlength="100"></el-input>
         </el-form-item>
-        <el-form-item label="产品类型" class="search-item">
-          <el-select filterable clearable v-model="nonConformitySearch.productName">
-            <el-option v-for="item1 in productNameList"
-                       :key="item1.value"
-                       :label="item1.label"
-                       :value="item1.value"></el-option>
-          </el-select>
-        </el-form-item>
         <el-form-item label="责任部门" class="search-item">
-          <el-input v-model="nonConformitySearch.responseUnit" v-show="false" />
-          <el-popover
-            placement="bottom"
-            popper-class="user-dept-popper"
-            trigger="click"
-            :value="false"
-          >
             <el-input
-              slot="reference"
               v-model="nonConformitySearch.responseUnitShow"
               placeholder="根据责任部门查找"
-              readonly
               clearable
               id="searchResp"
             />
-            <div class="api">
-              <laws-tree
-                :zNodes="zNodesSItem"
-                treeDivId="zNodesSItemSearch"
-                deptSelect
-                showRMenu
-                @treeDblClick="(treeId, treeNode) => treeClickSearch(treeId, treeNode)"
-                class="ztree" style="width: 200px;height: 400px;overflow: auto">
-              </laws-tree>
-            </div>
-          </el-popover>
         </el-form-item>
         <el-form-item class="search-item btn-box">
           <el-button
@@ -108,62 +80,71 @@
         align="center">
       </el-table-column>
       <el-table-column
-        prop="standNum"
+        prop="productBusiness"
         fixed="left"
         width="180"
         label="业务">
-        <template slot-scope="scope">
-          <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standNum }}</a>
-        </template>
+<!--        <template slot-scope="scope">-->
+<!--          <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standNum }}</a>-->
+<!--        </template>-->
       </el-table-column>
       <el-table-column
-        prop="standName"
+        prop="platform"
         fixed="left"
         width="180"
         label="平台">
-        <template slot-scope="scope">
-          <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>
-        </template>
+<!--        <template slot-scope="scope">-->
+<!--          <a @click="detailsStandard(scope.row)" class="table-jump">{{ scope.row.standName }}</a>-->
+<!--        </template>-->
       </el-table-column>
       <el-table-column
-        prop="productNameShow"
+        prop="pojName"
         width="180"
         label="项目">
       </el-table-column>
       <el-table-column
-        prop="productNameShow"
+        prop="currentNode"
         width="180"
         label="当前节点">
       </el-table-column>
       <el-table-column
-        prop="standName"
+        prop="lawsName"
         fixed="left"
         width="180"
         label="标准编号/政策编号">
+          <template slot-scope="scope">
+           {{ scope.row.lawsName + '/' + scope.row.lawsNumber }}
+          </template>
       </el-table-column>
       <el-table-column
-        prop="planCloseTime"
+        prop="conceptualState"
         width="150"
         sortable="custom"
-        label="实施时间">
+        label="概念状态">
       </el-table-column>
       <el-table-column
-        prop="responseEnginShow"
+        prop="scheduledIssuanceTime"
+        width="200"
+        sortable="custom"
+        label="概念计划下发时间">
+      </el-table-column>
+      <el-table-column
+        prop="revisedPlan"
         width="150"
-        label="实施要求">
+        label="概念修订计划">
       </el-table-column>
       <el-table-column
-        prop="responseEnginShow"
+        prop="explanation"
         width="150"
-        label="符合性状态">
+        label="其他说明">
       </el-table-column>
       <el-table-column
-        prop="responseUnitShow"
+        prop="responseInsName"
         width="180"
         label="责任部门">
       </el-table-column>
       <el-table-column
-        prop="responseEnginShow"
+        prop="responseUserName"
         width="150"
         label="责任工程师">
       </el-table-column>
@@ -198,11 +179,12 @@ export default {
       total: 0,
       // 当前页数
       pageNo: 1,
+      pageSize: 20,
       causeList: [], //事业部数据
       nonConformitySearch: {
         standNumOrName: '', // 编号/名称
         productName: '', // 产品类型
-        responseUnit: '' // 责任部门
+        responseUnitShow: '' // 责任部门
       },
       // 产品类型下拉列表数据
       productNameList: [],
@@ -217,13 +199,14 @@ export default {
       const params = {
         lawsNumber: this.nonConformitySearch.standNumOrName,
         lawsName: this.nonConformitySearch.standNumOrName,
-        productBusiness: this.nonConformitySearch.productName,
+        responseInsName: this.nonConformitySearch.responseUnitShow,
         isClose: '0',
-        page: 1,
-        pageSize: 20
+        page: this.pageNo,
+        pageSize: this.pageSize
       }
       productDeptIssue(params).then(res => {
-        console.log(res)
+        this.causeList = res.data.records
+        this.total = res.data.total
       })
     },
     //点击批量关闭按钮事件