Merge remote-tracking branch 'origin/develop' into develop

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

@@ -52,6 +52,16 @@
                           placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
+                <el-form-item label="选择标准附件" class="add-form-item form-item-disabled">
+                  <div class="addButton">
+                    <el-button  size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
+                  </div>
+                </el-form-item>
+                <el-form-item label="标准附件" class="add-form-item form-item-disabled">
+                  <div style="display: flex;">
+                    <div class="table-jump" @click="updataFj(item)" style="margin-right: 15px;" v-for="(item, index) in form.fjList" :key="index">{{ item.fileName }}</div>
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -255,6 +265,38 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <el-drawer
+            title="选择附件"
+            :visible.sync="fzlistModel"
+            size="900px"
+            custom-class="demo-drawer"
+    >
+      <div class="standardForComments">
+        <div class="content" style="height: calc(100% - 57px);">
+          <div class="table-wrap">
+            <div style="position: absolute;height: calc(100% - 10px);width: 100%;">
+              <el-table
+                      ref="selection"
+                      :data="fjList"
+                      tooltip-effect="dark"
+                      style="width: 100%;padding:0 0 20px 0;"
+                      height="100%"
+                      border
+                      @selection-change="handleSelection2"
+                      :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}">
+                <el-table-column type="selection" width="55" align="center"/>
+                <el-table-column label="附件名" align="center" prop="fileName"></el-table-column>
+              </el-table>
+            </div>
+          </div>
+        </div>
+        <loading :loading="fzShow">数据加载中……</loading>
+        <div class="demo-drawer-footer">
+          <el-button size="mini" @click="closeDrawer2">取消</el-button>
+          <el-button type="primary" size="mini" @click="enterDrawer2">带入</el-button>
+        </div>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
@@ -269,6 +311,10 @@ export default {
   name: "bzzqyjStep1",
   data() {
     return {
+      addFjList: [],
+      fzShow: false,
+      fzlistModel: false,
+      fjList: [],
       commentText: '',
       textarea: '', // 意见
       title: '', // 新增抽屉标题
@@ -283,6 +329,7 @@ export default {
         cname: '', // 名称
         standType: '',
         standId: '',
+        fjList: []
       },
       formRules: {
         cid: [
@@ -364,6 +411,27 @@ export default {
     }
   },
   methods: {
+    updataFj (item) {},
+    addfjList () {
+      this.$http.get('lawss/sarStandFile/queryFileInfo', {
+        standId: this.form.standId
+      }, {}, res => {
+        this.fjList = res.data
+      })
+      this.fzlistModel = true
+    },
+    handleSelection2 (data) {
+      console.log(data);
+      this.addFjList = data
+    },
+    closeDrawer2 () {
+      this.fzlistModel = false
+      this.addFjList = []
+    },
+    enterDrawer2 () {
+      this.fzlistModel = false
+      this.form.fjList = this.addFjList
+    },
     // 点击查看
     handlePreview (item) {
       let pageType