未符合项整改流程

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

@@ -198,7 +198,7 @@
         height="100%"
         :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-        @selection-change="selectThree"
+        @selection-change="selectedChange"
       >
         <el-table-column type="selection" width="55" align="center"/>
         <el-table-column prop="standId" label="标准号/标准名称"/>
@@ -316,6 +316,9 @@ export default {
     ProcessFooter,
     ProcessTitle
   },
+  mounted () {
+    this.getTree()
+  },
   methods: {
     //点击新增事件
     addList() {
@@ -367,27 +370,15 @@ export default {
     //未符合项整合确定事件
     OkDrawer() {
       if (this.selectedList.length !== 0) {
-        let deposit = new Map();
+        this.dataList = this.selectedList
-        this.unqualidiedData.forEach(item => {
-          deposit.set(item.id, item);
-        });
-        let bringData = [];
-        for (let i = 0; i < this.selectedList.length; i++) {
-          bringData.push(deposit.get(this.selectedList[i]));
-        }
-        this.dataList.standId = bringData[0].standId
-        this.dataList.productName = bringData[0].productName;
-        this.dataList.itemsNum = bringData[0].itemsNum;
-        this.dataList.itemsName = bringData[0].itemsName;
-        this.dataList.planCloseTime = bringData[0].planCloseTime;
-        this.dataList.responsibleUnit = bringData[0].responsibleUnit;
-        this.dataList.dutyEngineer = bringData[0].dutyEngineer;
         this.ListModel = false;
       } else {
         this.$message.warning("请选择至少一条数据进行带入");
       }
     },
-    selectThree() {},
+    selectedChange(val) {
+      this.selectedList = val
+    },
     handleTabs(name) {
       this.active = name
     },

src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue

@@ -16,18 +16,20 @@
         <el-form :modal="dataList" inline class="label-input-form">
             <el-form-item label="标准号/标准名称" class="search-item">
               <el-input v-model="dataList.standId"
+                size="small"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
             </el-form-item>
             <el-form-item label="项目名称" class="search-item">
               <el-input v-model="dataList.productName"
+                size="small"
                 placeholder="请输入"
                 clearable
                 :maxlength="100"></el-input>
             </el-form-item>
-            <el-form-item label="责任部门" class="search-item">
+          <el-form-item label="责任部门" class="search-item">
-              <el-input v-model="dataList.responsibleUnit" v-show="false" />
+              <el-input v-model="dataList.responsibleUnit" v-show="false"/>
               <el-popover
                 placement="bottom"
                 popper-class="user-dept-popper"
@@ -35,6 +37,7 @@
                 :value="false"
               >
                 <el-input
+                  size="small"
                   slot="reference"
                   v-model="dataList.responseUnitShow"
                   placeholder="根据责任部门查找"
@@ -60,7 +63,7 @@
                 class="common-button-primary"
                 size="mini"
                 v-btn-permission="'b3aaea6d18f5871b68825d3783eb736a'"
-                @click="getTableByPage('dataList')">
+                @click="getTableByPage">
                 查询
               </el-button>
             </el-form-item>
@@ -104,7 +107,12 @@
           <el-table-column label="选择分发责任人" prop="dutyPeople">
               <template slot-scope="scope">
                 <span v-if="scope.row.show">
-                  <el-input v-model="scope.row.dutyPeople"  size="mini" placeholder="请输入内容" @click.native="choiceDuty"></el-input>
+                  <el-input
+                    v-model="scope.row.dutyPeople"
+                    size="mini"
+                    placeholder="请输入内容"
+                    @click.native="choiceDuty"
+                  />
                 </span>
                 <span v-else>{{scope.row.dutyPeople}}</span>
             </template>
@@ -429,6 +437,8 @@ export default {
         this.multipleSelection = []
         this.$refs.multipleTable.clearSelection();
       }
+
+
       if (this.type === 'dockUser') {
         this.roleForm.dockUser = this.roleRow.id
         this.roleForm.dockUserName = this.roleRow.name
@@ -450,6 +460,7 @@ export default {
     },
     //未整改项抽屉中的查询按钮
     getTableByPage() {
+      this.getData()
     },
     // 清空 查询条件
     clearAllSearch (search = true) {

src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue

@@ -15,16 +15,20 @@
         </ProcessTitle>
         <el-form :modal="dataList" inline class="label-input-form">
           <el-form-item label="标准号/标准名称" class="search-item">
-            <el-input v-model="dataList.standId"
+            <el-input
-                      placeholder="请输入"
+              size="small"
-                      clearable
+              v-model="dataList.standId"
-                      :maxlength="100"></el-input>
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="项目名称" class="search-item">
-            <el-input v-model="dataList.productName"
+            <el-input
-                      placeholder="请输入"
+              size="small"
-                      clearable
+              v-model="dataList.productName"
-                      :maxlength="100"></el-input>
+              placeholder="请输入"
+              clearable
+              :maxlength="100"></el-input>
           </el-form-item>
           <el-form-item label="责任部门" class="search-item">
             <el-input v-model="dataList.responsibleUnit" v-show="false" />
@@ -35,6 +39,7 @@
               :value="false"
             >
               <el-input
+                size="small"
                 slot="reference"
                 v-model="dataList.responseUnitShow"
                 placeholder="根据责任部门查找"
@@ -81,7 +86,6 @@
           style="width: 100%"
           :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',
               fontWeight: 'bold', height: '48px'}">
-          <el-table-column type="selection" width="55" align="center"/>
           <el-table-column prop="standId" label="标准号/标准名称"/>
           <el-table-column prop="productName" label="项目名称"/>
           <el-table-column prop="itemsNum" label="条款号"/>
@@ -89,9 +93,21 @@
           <el-table-column prop="planCloseTime" label="整改完成时间"/>
           <el-table-column prop="responsibleUnit" label="责任部门"/>
           <el-table-column prop="dutyEngineer" label="责任工程师"/>
-          <el-table-column label="选择责任人">
+          <el-table-column label="选择责任人" prop="dutyPeople" width="200">
             <template slot-scope="scope">
-              <el-button type="primary" size="small" @click="selectPeople(scope.row)">选择责任人</el-button>
+              <div style="display: inline;">
+                <el-input
+                  class="input-button"
+                  style="width: 60%"
+                  :disabled="true"
+                  v-model="scope.row.dutyPeople"
+                  size="mini"
+                  placeholder="请选择责任人"
+                />
+              </div>
+              <div style="display: inline">
+                <el-button size="mini" type="primary" @click="selectPeople(scope.row)">选择</el-button>
+              </div>
             </template>
           </el-table-column>
         </el-table>
@@ -246,7 +262,8 @@ export default {
           itemsName: '1',
           planCloseTime: '1',
           responsibleUnit: '1',
-          dutyEngineer: '1'
+          dutyEngineer: '1',
+          dutyPeople: '13123'
         },{
           standId: '',
           productName: '',
@@ -254,12 +271,11 @@ export default {
           itemsName: '',
           planCloseTime: '',
           responsibleUnit: '',
-          dutyEngineer: ''
+          dutyEngineer: '',
+          dutyPeople: ''
         }],
-      // 当前页数
+      newDataList: [],
-      pageNo: 1,
+
-      total: 0,
-      myLoading: false,
       // 责任部门
       zNodesSItem: [],
       unqualidiedData: [{
@@ -271,7 +287,7 @@ export default {
         responsibleUnit: '',
         dutyEngineer: ''
       }],
-      selectedList: [],  //未整改项的选择框
+
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
@@ -294,26 +310,13 @@ export default {
     ProcessTitle
   },
   created() {
+    this.getTree()
   },
   methods: {
-    getList() {
+    // 选择责任人的按钮操作
-      this.myLoading.loadData = true
+    selectPeople(val) {
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
+      this.newDataList = val
-        ...this.nonConformitySearch,
+      this.nodeList = []
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
-    },
-
-    selectPeople(row) {
       this.modalshowflag = true
     },
     handleTabs(name) {
@@ -350,6 +353,10 @@ export default {
     },
     // 流程节点负责人抽屉保存按钮
     saveUserInfo () {
+      // 选择责任人时input框内值
+      this.newDataList.dutyPeople = this.roleRow.name
+
+
       if (this.type === 'dockUser') {
         this.roleForm.dockUser = this.roleRow.id
         this.roleForm.dockUserName = this.roleRow.name

src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue

@@ -87,11 +87,27 @@
           <el-table-column prop="itemsName" label="条款名称"/>
           <el-table-column prop="planCloseTime" label="整改完成时间"/>
           <el-table-column prop="responsibleUnit" label="责任部门"/>
-          <el-table-column prop="duty" label="负责人"/>
+          <el-table-column prop="dutyPeople" label="负责人"/>
           <el-table-column label="佐证材料">
             <template slot-scope="scope">
-              <el-upload>
+              <el-upload
-                <el-button type="primary" size="small" @click="uploadText(scope.row)">上传佐证材料</el-button>
+                v-model="fileText"
+                ref="uploadFile"up
+                :action="uploadPath"
+                class="upload-demo"
+                :http-request="handleUpload"
+                :on-success="handleOnsuccess"
+                :on-error="handleOnError"
+                :before-upload="handleBeforeUpload"
+                :before-remove="handleBeforeRemove"
+                :on-remove="handleOnRemove"
+                :on-exceed="handleExceed"
+                :limit="10"
+                :file-list="uploadFileList"
+                list-type="picture"
+                :auto-upload="true"
+              >
+                <el-button type="text">上传佐证材料</el-button>
               </el-upload>
             </template>
           </el-table-column>
@@ -247,7 +263,8 @@ export default {
           itemsName: '1',
           planCloseTime: '1',
           responsibleUnit: '1',
-          dutyEngineer: '1'
+          dutyEngineer: '1',
+          dutyPeople: '13123'
         },{
           standId: '',
           productName: '',
@@ -255,24 +272,21 @@ export default {
           itemsName: '',
           planCloseTime: '',
           responsibleUnit: '',
-          dutyEngineer: ''
+          dutyEngineer: '',
+          dutyPeople: '13123'
         }],
       // 当前页数
       pageNo: 1,
       total: 0,
       myLoading: false,
+      // 上传路径
+      uploadPath: 'api/att/attFile/upload',
+      // 上传文件所储存的数组
+      uploadFileList: [],
       // 责任部门
       zNodesSItem: [],
-      unqualidiedData: [{
+
-        standId: '',
+
-        productName: '',
-        itemsNum: '',
-        itemsName: '',
-        planCloseTime: '',
-        responsibleUnit: '',
-        dutyEngineer: ''
-      }],
-      selectedList: [],  //未整改项的选择框
       roleForm: {
         startUserName: this.$store.getters.userInfo.userName,
         startUser: this.$store.getters.userInfo.userId,
@@ -297,29 +311,31 @@ export default {
   created() {
   },
   methods: {
-    getList() {
-      this.myLoading.loadData = true
-      this.$http.get('sarStandUnqualified/sar-stand-unqualified', {
-        ...this.nonConformitySearch,
-        current: this.pageNo,
-        size: this.$store.getters.userInfo.configContent
-      }, {
-        _this: this
-      }, res => {
-        this.myLoading.loadData = false
-        this.nonList = res.data.records
-        this.total = res.data.total
-      }, e => {
-        this.myLoading.loadData = false
-      })
-    },
 
-    uploadText(row) {
+
-    },
     handleTabs(name) {
       this.active = name
     },
-
+    /************ 上传佐证材料 *****************/
+    // 上传材料
+    handleUpload() {},
+    // 文件上传成功
+    handleOnsuccess(res, file) {
+      this.$message.success('上传成功!')
+      console.log(file)
+    },
+    // 文件上传失败后回调
+    handleOnError(res, file) {},
+    // 文件上传限制条件
+    handleBeforeUpload() {},
+    // 移除上传的文件
+    handleBeforeRemove() {},
+    handleOnRemove() {},
+    // 文件超过限制数量提示
+    handleExceed() {
+      this.$message.error(``)
+    },
+    /************ ********* *****************/
     // 保存按钮
     handleSave() {},
     // 提交按钮