企标制修订手机页面

src/pages/processCenter/pages/phone/qbrk-product/common/formEditList.vue

@@ -9,9 +9,9 @@
           <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
             <el-select v-model="form.standSort" filterable clearable :disabled="form.standStatus && form.standStatus === '3'">
               <el-option
-                      v-for="item in standSortOptions"
+                      v-for="(item, index) in standSortOptions"
                       placeholder="请选择企标类别"
-                      :key="item.value"
+                      :key="index"
                       :value="item.value"
                       :label="item.label"
               ></el-option>
@@ -36,12 +36,6 @@
                            value-format="yyyy-MM-dd"
             ></el-datePicker>
           </el-form-item>
-          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.expirationDate"
-                           placeholder="请选择截止日期"
-                           :editable="false"
-            ></el-datePicker>
-          </el-form-item>
           <!--                                <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
           <!--                                    <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="请选择文本状态">-->
           <!--                                        <el-option-->
@@ -86,6 +80,16 @@
           <!--                                            clearable-->
           <!--                                    ></el-input>-->
           <!--                                </el-form-item>-->
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standStatus" filterable disabled>
+              <el-option
+                      v-for="item in opinionsStand"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="企业标准号" v-show="fbNode || form.standStatus === '3'" prop="standCode" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.standCode" :disabled="disabledState"
@@ -99,6 +103,12 @@
                     clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.expirationDate"
+                           placeholder="请选择截止日期"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
           <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
             <el-datePicker v-model="form.putTime"
                            :editable="false"
@@ -106,16 +116,6 @@
                            value-format="yyyy-MM-dd"
             ></el-datePicker>
           </el-form-item>
-          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
-            <el-select v-model="form.standStatus" filterable disabled>
-              <el-option
-                      v-for="item in opinionsStand"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-              ></el-option>
-            </el-select>
-          </el-form-item>
           <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
           <!--          <el-datePicker v-model="form.issueTime"-->
           <!--                         :editable="false"-->
@@ -144,12 +144,12 @@
                     v-model="form.FBGBUSSName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -172,12 +172,12 @@
                     v-model="form.LSBBBUSSName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -202,12 +202,12 @@
                     v-model="form.XGDName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -230,12 +230,12 @@
                     v-model="form.QTWJBUSSName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -361,7 +361,7 @@
                     class="common-button-primary"
                     size="mini"
                     style="position:absolute;top: 10px;right: 0;"
-                    @click="selectLaws('DTQBBHBUSS'),config.attrName = '代替企标编号'"
+                    @click="selectLaws('DTQBBHBUSS','代替企标编号')"
             >{{'手动查找'}}</el-button>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
@@ -371,12 +371,12 @@
                     v-model="form.GLWJBUSSName"
                     clearable
             ></el-input>
-            <div style="display: flex;justify-content: space-between">
+            <div style="display: flex;justify-content: space-between;margin-left: 12px;">
-              <div style="width: 80%;">
+              <div style="width: 80%;margin-top: 13px">
                 <div v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
-                  <span style="width: 80%;" @click="handleFilePreview(item,'preview')">{{ item.name }}</span>
+                  <span style="" @click="handleFilePreview(item,'preview')" :title="item.name">{{ item.name  }}</span>
-                  <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                  <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
                 </div>
               </div>
@@ -433,7 +433,7 @@
                 class="common-button-primary"
                 size="mini"
                 style="position:absolute;top: 10px;right: 0;"
-                @click="selectLaws('BDTQBBHBUSS'),config.attrName = '被代替企标编号'"
+                @click="selectLaws('BDTQBBHBUSS','被代替企标编号')"
             >{{'手动查找'}}</el-button>
           </el-form-item>
           <el-form-item label="上传时间" prop="XCSJBUSS" class="add-form-item form-item-disabled">
@@ -663,6 +663,22 @@
         default: false
       },
     },
+    filters: {
+      ellipsis (value) {
+        if (!value) return ''
+        if (value.length > 35) {
+          return value.slice(0,35) + '...'
+        }
+        return value
+      },
+      ellipsis2 (value) {
+        if (!value) return ''
+        if (value.length > 12) {
+          return value.slice(0,12) + '...'
+        }
+        return value
+      }
+    },
     data () {
       return {
         opinionsStand:[
@@ -797,7 +813,7 @@
         }, e => {
         })
       },
-      selectLaws (type) {
+      selectLaws (type,title) {
         // if (this.standNumFlag === 1) {
         // this.$refs.selections.selectAll(false)
         // }
@@ -805,7 +821,7 @@
         this.replaceLawsNumModel = true
         this.replaceLawType = ''
         this.replaceLawType = type
-        this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType);
+        this.$emit('formSelectLawsCancel', this.replaceLawsNumModel,this.replaceLawType,title);
       },
       fileUpload (type) {
         // this.fileMadel = true;//此句应在最后执行,否则会有先显示没变换的的文件列表,在显示变换了的文件列表
@@ -963,5 +979,7 @@
 </script>
 
 <style scoped>
-
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 </style>

src/pages/processCenter/pages/phone/qbrk-product/common/formList.vue

@@ -5,7 +5,7 @@
     </ProcessTitle>
     <div class="prc-content-border">
       <el-row :gutter="24">
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
             <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
               <el-option
@@ -22,16 +22,15 @@
                     clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.issueTime" :disabled="disabledState"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
           <el-form-item label="企标备案日期" prop="BARQ" class="add-form-item form-item-disabled">
             <el-datePicker v-model="form.BARQ" :disabled="disabledState"
                            :editable="false"></el-datePicker>
           </el-form-item>
-          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.expirationDate" :disabled="disabledState"
-                           placeholder="请选择截止日期"
-                           :editable="false"
-            ></el-datePicker>
-          </el-form-item>
 
           <!--                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
           <!--                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
@@ -56,7 +55,34 @@
                       clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
+          <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
+          <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
+          <!--                                  <el-option-->
+          <!--                                      v-for="item in countryOptions"-->
+          <!--                                      placeholder="请选择"-->
+          <!--                                      :key="item.value"-->
+          <!--                                      :value="item.value"-->
+          <!--                                      :label="item.label"-->
+          <!--                                  ></el-option>-->
+          <!--                                </el-select>-->
+          <!--                              </el-form-item>-->
+          <!--                            <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
+          <!--                                <el-input-->
+          <!--                                        v-model="form.standNumber" :disabled="disabledState"-->
+          <!--                                        clearable-->
+          <!--                                ></el-input>-->
+          <!--                            </el-form-item>-->
+          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+            <el-select v-model="form.standStatus" filterable :disabled="disabledState">
+              <el-option
+                      v-for="item in opinionsStand"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+              ></el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="企业标准号" v-show="form.standStatus === '3'" prop="standCode" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.standCode" :disabled="disabledState"
@@ -69,25 +95,17 @@
                     clearable
             ></el-input>
           </el-form-item>
+          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.expirationDate" :disabled="disabledState"
+                           placeholder="请选择截止日期"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
           <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
             <el-datePicker v-model="form.putTime" :disabled="disabledState"
                            :editable="false"></el-datePicker>
           </el-form-item>
-          <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
+
-            <el-select v-model="form.standStatus" filterable :disabled="disabledState">
-              <el-option
-                      v-for="item in opinionsStand"
-                      :key="item.value"
-                      :value="item.value"
-                      :label="item.label"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.issueTime" :disabled="disabledState"
-                           :editable="false"
-            ></el-datePicker>
-          </el-form-item>
           <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
           <!--          <el-datePicker v-model="form.issueTime" :disabled="disabledState"-->
           <!--                         :editable="false"-->
@@ -107,12 +125,12 @@
     </ProcessTitle>
     <div class="prc-content-border"  v-show="verifySarStandard">
       <el-row :gutter="24">
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -121,10 +139,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -133,12 +151,12 @@
             <!--          </div>-->
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
-            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -147,10 +165,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -166,7 +184,7 @@
     </ProcessTitle>
     <div class="prc-content-border"  v-show="verifySarStandard">
       <el-row :gutter="24">
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
             <el-input v-model="form.QCDW"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
@@ -200,7 +218,7 @@
             <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
           </el-form-item>
@@ -241,7 +259,7 @@
     </ProcessTitle>
     <div class="prc-content-border"  v-show="verifySarStandard">
       <el-row :gutter="24">
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.DTQBBHBUSS" :disabled="disabledState"
@@ -249,10 +267,10 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -273,7 +291,7 @@
 <!--            ></el-input>-->
 <!--          </el-form-item>-->
         </el-col>
-        <el-col :span="24">
+        <el-col :span="12">
           <el-form-item label="被代替企标编号" prop="BDTQBBHBUSS" class="add-form-item form-item-disabled">
             <el-input
                     v-model="form.BDTQBBHBUSS" :disabled="disabledState"
@@ -316,7 +334,7 @@
               default-expand-all>
         <el-table-column
                 label="序号"
-                min-width="12%"
+                min-width="6%"
                 align="center">
           <template slot-scope="scope">
             {{scope.$index + 1}}
@@ -325,7 +343,7 @@
         <el-table-column
                 prop="modelNum"
                 label="条款号"
-                min-width="13%"
+                min-width="8%"
                 align="center"
         >
         </el-table-column>
@@ -372,7 +390,7 @@
                 prop="zrDeptIdName"
                 label="提出部门"
                 align="center"
-                min-width="20%">
+                min-width="15%">
           <!--                                <template slot-scope="scope">-->
           <!--                                    <el-form-item-->
           <!--                                            style="margin-left: 0;margin-bottom:0;"-->
@@ -396,7 +414,7 @@
         </el-table-column>
         <el-table-column
                 label="意见是否采纳"
-                min-width="20%"
+                min-width="15%"
                 align="center">
           <template slot-scope="scope">
             {{filterOp(scope.row.opinionsAdopted)}}
@@ -502,8 +520,8 @@
       },
       ellipsis22 (value) {
         if (!value) return ''
-        if (value.length > 22) {
+        if (value.length > 12) {
-          return value.slice(0,22) + '...'
+          return value.slice(0,12) + '...'
         }
         return value
       }
@@ -664,5 +682,7 @@
 </script>
 
 <style scoped>
-
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 </style>

src/pages/processCenter/pages/phone/qbrk-product/common/formListIn.vue

@@ -35,12 +35,6 @@
             <el-input v-model="form.standYear" :disabled="disabledState"
                       clearable></el-input>
           </el-form-item>
-          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.expirationDate" :disabled="disabledState"
-                           placeholder="请选择截止日期"
-                           :editable="false"
-            ></el-datePicker>
-          </el-form-item>
           <!--                            <el-form-item  label="文本状态" prop="textStatusBuss" class="add-form-item form-item-disabled">-->
           <!--                                <el-select :popper-append-to-body="false" v-model="form.textStatusBuss" placeholder="" :disabled="disabledState">-->
           <!--                                    <el-option-->
@@ -78,22 +72,6 @@
           <!--                                        clearable-->
           <!--                                ></el-input>-->
           <!--                            </el-form-item>-->
-          <el-form-item label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
-            <el-input
-                    v-model="form.standCode" :disabled="disabledState"
-                    clearable
-            ></el-input>
-          </el-form-item>
-          <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
-            <el-datePicker v-model="form.putTime" :disabled="disabledState"
-                           :editable="false"></el-datePicker>
-          </el-form-item>
-          <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
-            <el-input
-                    v-model="form.standEnName" :disabled="disabledState"
-                    clearable
-            ></el-input>
-          </el-form-item>
           <el-form-item label="制修订类型" prop="standStatus" class="add-form-item form-item-disabled">
             <el-select v-model="form.standStatus" filterable clearable :disabled="disabledState" >
               <el-option
@@ -104,6 +82,28 @@
               ></el-option>
             </el-select>
           </el-form-item>
+          <el-form-item label="企业标准号" prop="standCode" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standCode" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="英文名称" prop="standEnName" class="add-form-item form-item-disabled">
+            <el-input
+                    v-model="form.standEnName" :disabled="disabledState"
+                    clearable
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="截止日期" prop="expirationDate" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.expirationDate" :disabled="disabledState"
+                           placeholder="请选择截止日期"
+                           :editable="false"
+            ></el-datePicker>
+          </el-form-item>
+          <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
+            <el-datePicker v-model="form.putTime" :disabled="disabledState"
+                           :editable="false"></el-datePicker>
+          </el-form-item>
           <!--        <el-form-item v-show="verifySarStandard" label="发布日期" prop="issueTime" class="add-form-item form-item-disabled">-->
           <!--          <el-datePicker v-model="form.issueTime" :disabled="disabledState"-->
           <!--                         :editable="false"-->
@@ -125,10 +125,10 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -137,10 +137,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -151,10 +151,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="修改单" prop="XGDName" class="add-form-item form-item-disabled">
-            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="XGDFileList.length > 0" v-for="(item,index) in XGDFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -163,10 +163,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -265,10 +265,10 @@
             ></el-input>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -518,8 +518,8 @@
       },
       ellipsis22 (value) {
         if (!value) return ''
-        if (value.length > 22) {
+        if (value.length > 12) {
-          return value.slice(0,22) + '...'
+          return value.slice(0,12) + '...'
         }
         return value
       }
@@ -685,5 +685,7 @@
 </script>
 
 <style scoped>
-
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 </style>

src/pages/processCenter/pages/phone/qbrk-product/step10.vue

@@ -35,7 +35,7 @@
             <div>
               <el-collapse accordion v-model="activeName">
                 <el-collapse-item title="审批意见" name = "1">
-                  <div style="margin:10px 0;">
+                  <div style="margin: 10px 0;">
                     <el-form
                       ref="formTongGuo"
                       :model="formTongGuo"
@@ -139,39 +139,31 @@
           <div class="block" style="padding-top: 20px;" v-show="active === '3'">
             <div class="flow-list">
               <el-table
-                height="100%"
+                :height="tablePHeight"
                 ref="selection"
                 :data="detailData"
                 tooltip-effect="dark"
-                style="width: 100%"
+                style="width: 100%;"
                 border
                 row-key="id"
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
               >
-                <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-                </el-table-column>
                 <el-table-column
                   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
                   prop="createTime"
                   label="创建时间"
-                  sortable="custom"
                   align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -330,7 +322,6 @@ export default {
         }]
       },
       loading: false,
-      drawerModal: false,
       assigneeNewLoading: false,
       dataLoading: true,
       disabledState: true,
@@ -347,9 +338,9 @@ export default {
       LSBBBUSSFileList: [],
       QTWJBUSSFileList: [],
       GLWJBUSSFileList: [],
-      XGDFileList: [],
       caFileList: [],
       FBGBJBDFileList: [],
+      XGDFileList: [],
       ZCWBLAWSFileList: [],
       GCWBLAWSFileList: [],
       JDWJLAWSFileList: [],
@@ -385,6 +376,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      tablePHeight:'',
       tableHeight: {
         standardTableHeight: null
       },
@@ -464,6 +456,7 @@ export default {
       multipleFlag2:'',
       url:'',
       urlChild:'',
+      drawerModal: false,
       drawerTitle: '', //drawer标题
       showCheckBox: true, // 树形控件是否展示多选框
       nodeKey: 'id',
@@ -901,19 +894,21 @@ export default {
       })
     },
     checkedRoleTransfer (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         userId:this.$store.getters.userInfo.account, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
-        this.assigneeNewLoading = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.processNum()
           this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
@@ -1699,6 +1694,19 @@ export default {
     popoverHideCancel(){
       this.modalShowFlag1  = false
     },
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData && checkedData.length != 0) {
+        if(checkedData.length > 0 && checkedData.length != 0){
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.form.cycvppsbm = checkedData.code
+          this.form.cycvppscn = checkedData.chineseName
+        }
+        this.modalShowFlag2 = false
+      }
+
+    },
     popoverHideBusVsCancel(){
       this.modalShowFlag2 = false
     },
@@ -1964,8 +1972,22 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
       })
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     assemble(ids,names){
       let list= new Array();
       if(ids && ids !== '' && names && names !== ''){
@@ -2007,33 +2029,16 @@ export default {
       }
     },
     processTable () {
-      this.$nextTick(() => {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-        Promise.all([this.getTaskId()]).then((value) => {
+        prcNum: this.$route.query.prcNum,
-          if(value[0] &&value.length > 0){
+        sortWord: this.shunxu ? this.paixu : "",
-            let mes = JSON.parse(value[0].mes)
+        shunxu: this.shunxu
-            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+      }, {
-            this.form = mes.form
+        loading: "loading",
-            this.taskIds = mes.taskIds;
+        _this: this
-            this.pId = mes.pId;
+      }, res => {
-            this.userId = mes.userId;
+        this.detailData = res
-            this.prcNum = mes.prcNum;
+      }, e => {
-            this.prcName = mes.prcName;
-            this.roleForm = mes.roleForm
-            this.commentText = mes.commentText
-          }
-          this.loading = true
-          this.$http.get('lawss/activiti/get_list_by_instance', {
-            prcNum: this.prcNum,
-            sortWord: this.shunxu ? this.paixu : '',
-            shunxu: this.shunxu
-          }, {
-            loading: 'loading',
-            _this: this
-          }, res => {
-            this.detailData = res
-            this.loading = false
-          }, e => {})
-        })
       })
     },
   },
@@ -2070,6 +2075,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }

src/pages/processCenter/pages/phone/qbrk-product/step12.vue

@@ -35,7 +35,7 @@
             <div>
               <el-collapse accordion v-model="activeName">
                 <el-collapse-item title="审批意见" name = "1">
-                  <div style="margin:10px 0;">
+                  <div style="margin: 10px 0;">
                     <el-form
                       ref="formTongGuo"
                       :model="formTongGuo"
@@ -139,39 +139,31 @@
           <div class="block" style="padding-top: 20px;" v-show="active === '3'">
             <div class="flow-list">
               <el-table
-                height="100%"
+                :height="tablePHeight"
                 ref="selection"
                 :data="detailData"
                 tooltip-effect="dark"
-                style="width: 100%"
+                style="width: 100%;"
                 border
                 row-key="id"
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
               >
-                <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-                </el-table-column>
                 <el-table-column
                   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
                   prop="createTime"
                   label="创建时间"
-                  sortable="custom"
                   align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -330,7 +322,6 @@ export default {
         }]
       },
       loading: false,
-      drawerModal: false,
       assigneeNewLoading: false,
       dataLoading: true,
       disabledState: true,
@@ -347,9 +338,9 @@ export default {
       LSBBBUSSFileList: [],
       QTWJBUSSFileList: [],
       GLWJBUSSFileList: [],
-      XGDFileList: [],
       caFileList: [],
       FBGBJBDFileList: [],
+      XGDFileList: [],
       ZCWBLAWSFileList: [],
       GCWBLAWSFileList: [],
       JDWJLAWSFileList: [],
@@ -385,6 +376,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      tablePHeight:'',
       tableHeight: {
         standardTableHeight: null
       },
@@ -464,6 +456,7 @@ export default {
       multipleFlag2:'',
       url:'',
       urlChild:'',
+      drawerModal: false,
       drawerTitle: '', //drawer标题
       showCheckBox: true, // 树形控件是否展示多选框
       nodeKey: 'id',
@@ -901,19 +894,21 @@ export default {
       })
     },
     checkedRoleTransfer (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         userId:this.$store.getters.userInfo.account, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
-        this.assigneeNewLoading = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.processNum()
           this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
@@ -1699,6 +1694,19 @@ export default {
     popoverHideCancel(){
       this.modalShowFlag1  = false
     },
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData && checkedData.length != 0) {
+        if(checkedData.length > 0 && checkedData.length != 0){
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.form.cycvppsbm = checkedData.code
+          this.form.cycvppscn = checkedData.chineseName
+        }
+        this.modalShowFlag2 = false
+      }
+
+    },
     popoverHideBusVsCancel(){
       this.modalShowFlag2 = false
     },
@@ -1964,8 +1972,22 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
       })
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     assemble(ids,names){
       let list= new Array();
       if(ids && ids !== '' && names && names !== ''){
@@ -2007,33 +2029,16 @@ export default {
       }
     },
     processTable () {
-      this.$nextTick(() => {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-        Promise.all([this.getTaskId()]).then((value) => {
+        prcNum: this.$route.query.prcNum,
-          if(value[0] &&value.length > 0){
+        sortWord: this.shunxu ? this.paixu : "",
-            let mes = JSON.parse(value[0].mes)
+        shunxu: this.shunxu
-            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+      }, {
-            this.form = mes.form
+        loading: "loading",
-            this.taskIds = mes.taskIds;
+        _this: this
-            this.pId = mes.pId;
+      }, res => {
-            this.userId = mes.userId;
+        this.detailData = res
-            this.prcNum = mes.prcNum;
+      }, e => {
-            this.prcName = mes.prcName;
-            this.roleForm = mes.roleForm
-            this.commentText = mes.commentText
-          }
-          this.loading = true
-          this.$http.get('lawss/activiti/get_list_by_instance', {
-            prcNum: this.prcNum,
-            sortWord: this.shunxu ? this.paixu : '',
-            shunxu: this.shunxu
-          }, {
-            loading: 'loading',
-            _this: this
-          }, res => {
-            this.detailData = res
-            this.loading = false
-          }, e => {})
-        })
       })
     },
   },
@@ -2070,6 +2075,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }

src/pages/processCenter/pages/phone/qbrk-product/step13.vue

@@ -19,27 +19,47 @@
           label-width="210px"
         >
           <div style="flex: auto;" v-show="active === '1'">
-            <formList
+            <formEditList
-              :form = "form"
+              :key = "formKey"
-              :FBGBUSSFileList = "FBGBUSSFileList"
+              :formSub = "form"
-              :LSBBBUSSFileList = "LSBBBUSSFileList"
+              :FBGBUSSFileListSub = "FBGBUSSFileList"
-              :BZSMBUSSFileList = "BZSMBUSSFileList"
+              :LSBBBUSSFileListSub = "LSBBBUSSFileList"
-              :QTWJBUSSFileList = "QTWJBUSSFileList"
+              :BZSMBUSSFileListSub = "BZSMBUSSFileList"
-              :GLWJBUSSFileList = "GLWJBUSSFileList"
+              :QTWJBUSSFileListSub = "QTWJBUSSFileList"
-              :XGDFileList = "XGDFileList"
+              :GLWJBUSSFileListSub = "GLWJBUSSFileList"
+              :XGDFileListSub = "XGDFileList"
               :disabledState = "disabledState"
               :verifySarStandard = "verifySarStandard"
+              :fileMadelSub = "fileMadel"
+              :fbgDown = "false"
               :opinionsShow = "true"
+              :fbNode = "true"
+              @formCancel="formCancel"
               @emitDataLoading="emitDataLoading"
-            ></formList>
+              @formSelectLawsCancel = "formSelectLawsCancel"
+              @formChoiceZRRListCancel = "formChoiceZRRListCancel"
+              @formChoiceQCDW = "formChoiceQCDW"
+              @formChoiceZRR1 = "formChoiceZRR1"
+              @formChoiceZRR2 = "formChoiceZRR2"
+              @formChoiceZRR3 = "formChoiceZRR3"
+              @formChoiceZRR4 = "formChoiceZRR4"
+            />
             <div>
               <el-collapse accordion v-model="activeName">
-                <el-collapse-item title="审批意见" name = "1">
+                <el-collapse-item title="回执说明" name = "1">
-                  <div style="margin:10px 0;">
+                  <div style="margin: 10px 0;">
                     <el-form
                       ref="formTongGuo"
                       :model="formTongGuo"
                       :rules="rules">
+                      <!--                    <el-form-item-->
+                      <!--                        prop="approvalOpinion"-->
+                      <!--                    >-->
+                      <!--                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
+                      <!--                        <el-option label="驳回" value="1"></el-option>-->
+                      <!--                        <el-option label="通过" value="0"></el-option>-->
+                      <!--                      </el-select>-->
+                      <!--                    </el-form-item>-->
                       <el-form-item
                         prop="commentText"
                       >
@@ -139,39 +159,31 @@
           <div class="block" style="padding-top: 20px;" v-show="active === '3'">
             <div class="flow-list">
               <el-table
-                height="100%"
+                :height="tablePHeight"
                 ref="selection"
                 :data="detailData"
                 tooltip-effect="dark"
-                style="width: 100%"
+                style="width: 100%;"
                 border
                 row-key="id"
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
               >
-                <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-                </el-table-column>
                 <el-table-column
                   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
                   prop="createTime"
                   label="创建时间"
-                  sortable="custom"
                   align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -248,7 +260,7 @@ import {
   processCreateStand,
   changeAssigneeNew,
   queryTaskFirst,
-  getBusStandFileByAttId, saveTaskFirst, processCreateBuss, taskDel, evaluationHisList
+  getBusStandFileByAttId, saveTaskFirst, processCreateBuss, taskDel, evaluationHisList, saveTaskForPub
 } from "api/process";
 import TreeSelect from '@/components/treeSelect/treeSelect.vue';
 import CusTomDataPickerGroup
@@ -329,9 +341,8 @@ export default {
           }
         }]
       },
+      taskInfo:'发布',
       loading: false,
-      drawerModal: false,
-      assigneeNewLoading: false,
       dataLoading: true,
       disabledState: true,
       userId:this.$store.getters.userInfo.account,
@@ -347,7 +358,9 @@ export default {
       LSBBBUSSFileList: [],
       QTWJBUSSFileList: [],
       GLWJBUSSFileList: [],
+      summaryFileList: [],
       XGDFileList: [],
+      madelSubList: [],
       caFileList: [],
       FBGBJBDFileList: [],
       ZCWBLAWSFileList: [],
@@ -385,6 +398,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      tablePHeight:'',
       tableHeight: {
         standardTableHeight: null
       },
@@ -421,6 +435,7 @@ export default {
       replaceLawsNumRow: [], // 代替政策号 数组内容
       replaceTotal: 0,
       selectedListRep: [],
+      selListRep2: [],
       replaceLoading: true,
       replacePage: 1,
       ListModel: false, // 新增编辑抽屉开关
@@ -439,6 +454,8 @@ export default {
         children: 'children',
         label: 'model'
       },
+      modalShowFlagZRBM: false,
+      nodeListZRBM: [],
       nodeList: [],
       nodeList2: [],
       zrType: '',
@@ -449,6 +466,7 @@ export default {
         children: 'children',
         label: 'name'
       },
+      formKey:1,
       key:1,
       key1:2,
       key2:3,
@@ -464,6 +482,7 @@ export default {
       multipleFlag2:'',
       url:'',
       urlChild:'',
+      drawerModal: false,
       drawerTitle: '', //drawer标题
       showCheckBox: true, // 树形控件是否展示多选框
       nodeKey: 'id',
@@ -481,7 +500,6 @@ export default {
       form: {
         selListRep2:[],
         id:'',
-        standNum:'',
         standStatus:'', // 标准状态
         planId:'',
         planStatus:'',
@@ -490,10 +508,13 @@ export default {
         modelData:[],
         modelDataNameVerify:[],
         modelDataZrUserVerify:[],
+        summaryFile:'',
+        summaryFileName:'',
+        madelSub:'',
+        madelSubName:'',
         BARQ: '',
         XGD: '',
         XGDName: '',
-        // 基础信息
         country:[],
         // 基础信息
         standSort: '',
@@ -519,14 +540,20 @@ export default {
         // 适用范围
         QCDW: '',
         QCRBUSS: '',
-        WJSCRYBUSS: this.$store.getters.userInfo.account,
+        WJSCRYBUSS: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')',
-        WJSCRYBUSSName: this.$store.getters.userInfo.userName,
+        WJSCRYBUSSName: this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')',
         SYCXCLASS: '',
         NYLXCLASS: '',
         SYCPXCLASS: '',
         TXLBBUSS: '',
         VPPSBMBUSS: '',
         VPPSCNBUSS: '',
+        KCVPPSBMBUSS: '',
+        KCVPPSCNBUSS: '',
+        CYCVPPSBMBUSS: '',
+        CYCVPPSCNBUSS: '',
+        DYBXHBUSS: '',
+        DYMCBUSS: '',
         // 关联信息
         DTQBBHBUSS: '',
         BDTQBBHBUSS: '',
@@ -535,6 +562,16 @@ export default {
         GLWJBUSS: '',
         GLWJBUSSName: '',
         XCSJBUSS: '',
+        //流程信息
+        topId:'',
+        prcNum:'',
+        commentText:'',
+        prcName:'',
+        standType: '',
+        CBCD:'',
+        CYBZ:'',
+        YYBZ:'',
+        standNum:'',
       }, // 标准信息
       roleForm:{
         hzUserId: this.$store.getters.userInfo.account,
@@ -543,6 +580,8 @@ export default {
         xdUserName: this.$store.getters.userInfo.userName,
         pxUserId: this.$store.getters.userInfo.account,
         pxUserName: this.$store.getters.userInfo.userName,
+        fbUserId: '',
+        fbUserName: '',
         qcUserId: '', // 多实例
         qcUserName:'', // 多实例
         bzhUserId:'',
@@ -603,7 +642,7 @@ export default {
         ],
       },
       rules:{
-        commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+        // commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
         approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
         zrUserIdName: [
           { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
@@ -634,8 +673,11 @@ export default {
         textStatusBuss: [
           { required: true, message: '请选择文本状态', trigger: 'change' }
         ],
+        standStatus: [
+          { required: true, message: '请选择标准状态', trigger: 'change' }
+        ],
         issueTime: [
-          { required: false, message: '请选择企标发布日期', trigger: 'change'}
+          { required: true, message: '请选择企标发布日期', trigger: 'change'}
         ],
         FBGBUSSName: [
           { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
@@ -722,6 +764,13 @@ export default {
         }
       }
     },
+    'form.standSort': {
+      handler (val) {
+        if (val !== '' && val !== null && typeof (val) !== 'undefined') {
+          this.getStandInfoByReviseStatus("")
+        }
+      }
+    },
     filterText(val) {
       this.$refs.tree.filter(val);
     },
@@ -732,6 +781,27 @@ export default {
     },
   },
   methods: {
+    checkedRoleTransfer (data) {
+      this.isSubmit = true
+      this.saveLoading = true
+      changeAssigneeNew({
+        taskId: this.$route.query.taskIds, // 任务id
+        userId:this.$store.getters.userInfo.account, // 委托人
+        assignee: data[0].id, // 被委托人
+        pId: this.$route.query.prcId, // 流程实例
+      }).then(res => {
+        this.isSubmit = false
+        this.saveLoading = false
+        if (res.success) {
+          this.drawerModal = false
+          this.$message.success('调整成功')
+          this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
+        } else {
+          this.$message.warning(res.message)
+        }
+      })
+    },
     drawerCheckZRBM(data) {
       let idList = ''
       let nameList = ''
@@ -785,9 +855,11 @@ export default {
     formChoiceZRRListCancel(type, title, id){
       this.choiceZRRList(type, title, id)
     },
-    formSelectLawsCancel(replaceLawsNumModel,replaceLawType){
+    formSelectLawsCancel(replaceLawsNumModel,replaceLawType,title){
+      this.replaceLawsNumForm.numberName = ""
       this.replaceLawsNumModel = replaceLawsNumModel
       this.replaceLawType = replaceLawType
+      this.config.attrName = title
       this.getReplaceLawsNumRow()
     },
     emitDataLoading(boo){
@@ -999,30 +1071,35 @@ export default {
       if (!value) return true;
       return data.name.indexOf(value) !== -1;
     },
-    getTaskId () {
+    getTaskId (mesg) {
-      if(this.$route.query.bpnId){
+      this.form = mesg.form
-        queryTaskFirst({
+      this.form.date = new Date(this.$moment(mesg.form.date).format('YYYY-MM-DD'))
-          bpnId: this.$route.query.bpnId
+      this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
-        }).then(res => {
+      this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
-          this.verifySarStandard = this.$route.query.verifySarStandard
+      this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
-          let mes = JSON.parse(res.mes)
+      this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')'
-          mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+      this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')'
-          this.form = mes.form
+      this.getStandInfoByReviseStatus()
-          this.getStandInfoByReviseStatus()
+      this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
-          this.footFileList=this.assemble(this.form.footFile,this.form.footFileName);
+      this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
-          this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
+      this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
-          this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
+      this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
-          this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
+      this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
-          this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName);
+      this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
-          this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
+      this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
-          this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName);
+      this.roleForm = mesg.roleForm
-          this.roleForm = mes.roleForm
+      this.formTongGuo.commentText = mesg.commentText
-          this.commentText = mes.commentText
+      this.formKey++
-          this.formKey++
+    },
-        })
+    filterObj(obj){
-      }else {
+      if(obj && obj !== ''){
-        this.form.XCSJBUSS = this.dateFormatter()
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
       }
+      return "";
     },
     // 将文本状态的id与name对应
     setMap(data){
@@ -1498,10 +1575,14 @@ export default {
       let textArr2 = []
       this.selectedListRep.map((item) => {
         let texts = ''
-        if (item.standYear != null && item.standYear !== '') {
+        if(item.standCode !== null && item.standCode !== ''){
-          texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+          texts = item.standCode
-        } else {
+        }else {
-          texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+          if (item.standYear != null && item.standYear !== '') {
+            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear
+          } else {
+            texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber
+          }
         }
         textArr2.push(item.standNumber)
         textArr.push(texts)
@@ -1512,14 +1593,14 @@ export default {
       // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',')
       // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖
       if(this.replaceLawType === 'DTQBBHBUSS'){
-        this.form.DTQBBHBUSS = textArr.join(',')
+        this.form.DTQBBHBUSS = this.filterSetData(textArr.join(','))
       }else if(this.replaceLawType === 'yybj'){
         this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',')
       }else if(this.replaceLawType === 'cbbh'){
         this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',')
       }else if(this.replaceLawType === 'BDTQBBHBUSS'){
-        this.form.BDTQBBHBUSS = textArr.join(',')
+        this.form.BDTQBBHBUSS = this.filterSetData(textArr.join(','))
-        this.form.standNum = textArr2.join(',')
+        this.form.standNum = this.filterSetData(textArr2.join(','))
       }else {
         this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',')
       }
@@ -1527,6 +1608,14 @@ export default {
       this.$refs.selections.clearSelection()
       this.formKey++
     },
+    filterSetData(data){
+      const arr=new Set()
+      let permission = data.split(",");
+      permission.forEach((item, index) => {
+        arr.add(item)
+      })
+      return Array.from(arr).join(',');
+    },
     // 点击查看
     handlePreview (item) {
       let routeUrl = this.$router.resolve({
@@ -1555,6 +1644,7 @@ export default {
       // this.$refs.selections.selectAll(false)
       // }
       // this.sarBussionessLawsEO.replaceLawsNum = ''
+      this.replaceLawsNumForm.numberName = ""
       this.replaceLawsNumModel = true
       this.replaceLawType = ''
       this.replaceLawType = type
@@ -1593,7 +1683,7 @@ export default {
       var fileSuffix = filename.substring(index1, index2)
       // const fileSuffix = file.name.split('.')[1] // 后缀名
       // 判断上传文件格式
-      if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.zip' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
+      if (fileSuffix === '.pdf' || fileSuffix === '.PDF' || fileSuffix === '.ppt'|| fileSuffix === '.PPT' || fileSuffix === '.pptx'|| fileSuffix === '.PPTX'|| fileSuffix === '.doc' || fileSuffix === '.DOC' || fileSuffix === '.docx' || fileSuffix === '.DOCX' || fileSuffix === '.xls' || fileSuffix === '.xlsx') {
         return true
       } else {
         this.spinShow = false
@@ -1676,9 +1766,9 @@ export default {
             this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined);
             this.LSBBBUSSFileList.push(fileObj)
             break;
-          case 'GLWJLAWS':
+          case 'QTWJBUSS':
-            this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined);
+            this.QTWJBUSSFileList = this.QTWJBUSSFileList.filter ( item => item.response === undefined);
-            this.GLWJLAWSFileList.push(fileObj)
+            this.QTWJBUSSFileList.push(fileObj)
             break;
           case 'GLWJBUSS':
             this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined);
@@ -1810,6 +1900,19 @@ export default {
     popoverHideCancel(){
       this.modalShowFlag1  = false
     },
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData && checkedData.length != 0) {
+        if(checkedData.length > 0 && checkedData.length != 0){
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.form.cycvppsbm = checkedData.code
+          this.form.cycvppscn = checkedData.chineseName
+        }
+        this.modalShowFlag2 = false
+      }
+
+    },
     popoverHideBusVsCancel(){
       this.modalShowFlag2 = false
     },
@@ -1862,27 +1965,32 @@ export default {
     handleTabs(name) {
       this.active = name
     },
+    handleTransfer() {
+      this.drawerModal = true
+      this.drawerTitle = '转办处理人'
+    },
     //保存
     handleSave() {
       this.form.country=this.countryArr;
       // if(item.country !== undefined && item.country !== null){
       //   this.sarStandardsInfoEO.country = item.country.split(",");
       // }
-
+      this.fileInfoHandle()
       this.saveLoading = true
       let _formData = new FormData()
       _formData.append('id', this.bpnId || '')
       _formData.append('createUser', this.$store.getters.userInfo.account)
       _formData.append('createUserName', this.$store.getters.userInfo.uName)
+      _formData.append('taskIds', this.taskIds)
       _formData.append('prcType', 'buss2')
       _formData.append('prcName', '企标制修订-产品标准')
       _formData.append('json', JSON.stringify({
         taskInfo: this.taskInfo,
         form: this.form,
         roleForm: this.roleForm,
-        commentText: this.commentText
+        commentText: this.formTongGuo.commentText
       }))
-      saveTaskFirst(_formData).then(res => {
+      saveTaskForPub(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
         this.bpnId = res.result
@@ -2126,6 +2234,11 @@ export default {
         this.form.prcName = this.prcName
         this.form.issueTime = this.dateFormatter()
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+        this.form['WJSCRYBUSS'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')'
+        this.form['WJSCRYBUSSName'] = this.$store.getters.userInfo.userName +'('+ (this.$store.getters.userInfo.account)+')'
         this.FBGBUSSFileList=this.assemble(item.FBGBUSS,item.FBGBUSSName);
         this.BZSMBUSSFileList=this.assemble(item.BZSMBUSS,item.BZSMBUSSName);
         this.LSBBBUSSFileList=this.assemble(item.LSBBBUSS,item.LSBBBUSSName);
@@ -2133,6 +2246,12 @@ export default {
         this.GLWJBUSSFileList=this.assemble(item.GLWJBUSS,item.GLWJBUSSName);
         this.XGDFileList=this.assemble(item.XGD,item.XGDName);
         this.getStandInfoByReviseStatus()
+        const dateArr = []
+        if(item.commentCycleStart && item.commentCycleEnd){
+          dateArr[0] = item.commentCycleStart
+          dateArr[1] = item.commentCycleEnd
+          this.commentCycleDate = dateArr
+        }
         this.formKey++
       })
     },
@@ -2156,14 +2275,12 @@ export default {
           }).then(res => {
             if (res) {
               const processForm = JSON.parse(res.mesg)
-              const dateArr = []
+              if (processForm.form === undefined) {
-              if(processForm.commentCycleStart && processForm.commentCycleEnd){
+                this.getFormFieldList(processForm)
-                dateArr[0] = processForm.commentCycleStart
+              } else {
-                dateArr[1] = processForm.commentCycleEnd
+                //表单文件处理
-                this.commentCycleDate = dateArr
+                this.getTaskId(processForm)
               }
-              this.getFormFieldList(processForm)
-              this.formKey++
             }
           }).catch(e => {
           })
@@ -2233,37 +2350,21 @@ export default {
 
     },
     processTable () {
-      this.$nextTick(() => {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-        Promise.all([this.getTaskId()]).then((value) => {
+        prcNum: this.$route.query.prcNum,
-          if(value[0] &&value.length > 0){
+        sortWord: this.shunxu ? this.paixu : "",
-            let mes = JSON.parse(value[0].mes)
+        shunxu: this.shunxu
-            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+      }, {
-            this.form = mes.form
+        loading: "loading",
-            this.taskIds = mes.taskIds;
+        _this: this
-            this.pId = mes.pId;
+      }, res => {
-            this.userId = mes.userId;
+        this.detailData = res
-            this.prcNum = mes.prcNum;
+      }, e => {
-            this.prcName = mes.prcName;
-            this.roleForm = mes.roleForm
-            this.commentText = mes.commentText
-          }
-          this.loading = true
-          this.$http.get('lawss/activiti/get_list_by_instance', {
-            prcNum: this.prcNum,
-            sortWord: this.shunxu ? this.paixu : '',
-            shunxu: this.shunxu
-          }, {
-            loading: 'loading',
-            _this: this
-          }, res => {
-            this.detailData = res
-            this.loading = false
-          }, e => {})
-        })
       })
     },
   },
   mounted () {
+    // this.getTaskId()
     this.getData()
     this.processTable()
     this.$http.get('sys/dictype/getDicTypeListCode', '', {
@@ -2296,6 +2397,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }

src/pages/processCenter/pages/phone/qbrk-product/step4.vue

@@ -55,42 +55,113 @@
               </el-collapse>
             </div>
           </div>
+          <!--            <div class="block" id="active2" v-show="active === '2'">-->
+          <!--                <ProcessTitle>-->
+          <!--                    <template slot="title">模块信息</template>-->
+          <!--                </ProcessTitle>-->
+          <!--                <template>-->
+          <!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
+          <!--                        <div class="action-bar">-->
+          <!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+          <!--                                批量编辑-->
+          <!--                            </el-button>-->
+          <!--                            <el-button-->
+          <!--                                    type="primary"-->
+          <!--                                    size="mini"-->
+          <!--                                    class="common-button-primary add-button"-->
+          <!--                                    @click="createRow"-->
+          <!--                            >创建模块</el-button>-->
+          <!--                        </div>-->
+          <!--                        <el-table-->
+          <!--                                ref="selection"-->
+          <!--                                tooltip-effect="dark"-->
+          <!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
+          <!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
+          <!--                                        fontWeight: 'bold', height: '48px'}"-->
+          <!--                                @selection-change="handleSelectionChange"-->
+          <!--                                row-key="id"-->
+          <!--                                :data="form.modelData"-->
+          <!--                                border-->
+          <!--                                default-expand-all-->
+          <!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+          <!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+          <!--                            <el-table-column-->
+          <!--                                    prop="modelNum"-->
+          <!--                                    label="序号"-->
+          <!--                                    min-width="15%"-->
+          <!--                                    align="center"-->
+          <!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+          <!--                            </el-table-column>-->
+          <!--                            <el-table-column-->
+          <!--                                    label="名称"-->
+          <!--                                    align="center"-->
+          <!--                                    min-width="30%">-->
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+          <!--                            </el-table-column>-->
+          <!--                            <el-table-column-->
+          <!--                                    label="责任人"-->
+          <!--                                    min-width="15%"-->
+          <!--                                    align="center">-->
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+          <!--                            </el-table-column>-->
+          <!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <div @click.stop style="display: inline-block">-->
+          <!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
+          <!--                                            <i class="iconfont">&#xe61e;</i>-->
+          <!--                                            <el-dropdown-menu slot="dropdown">-->
+          <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
+          <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
+          <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
+          <!--                                            </el-dropdown-menu>-->
+          <!--                                        </el-dropdown>-->
+          <!--                                    </div>-->
+          <!--                                </template>-->
+          <!--                            </el-table-column>-->
+          <!--                        </el-table>-->
+          <!--                    </div>-->
+          <!--                </template>-->
+          <!--            </div>-->
           <div class="block" style="padding-top: 20px;" v-show="active === '3'">
             <div class="flow-list">
               <el-table
-                height="100%"
+                :height="tablePHeight"
                 ref="selection"
                 :data="detailData"
                 tooltip-effect="dark"
-                style="width: 100%"
+                style="width: 100%;"
                 border
                 row-key="id"
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
               >
-                <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-                </el-table-column>
                 <el-table-column
                   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
                   prop="createTime"
                   label="创建时间"
-                  sortable="custom"
                   align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -248,7 +319,6 @@ export default {
         }]
       },
       loading: false,
-      drawerModal: false,
       assigneeNewLoading: false,
       dataLoading: true,
       disabledState: true,
@@ -304,6 +374,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      tablePHeight:'',
       tableHeight: {
         standardTableHeight: null
       },
@@ -383,6 +454,7 @@ export default {
       multipleFlag2:'',
       url:'',
       urlChild:'',
+      drawerModal: false,
       drawerTitle: '', //drawer标题
       showCheckBox: true, // 树形控件是否展示多选框
       nodeKey: 'id',
@@ -820,19 +892,21 @@ export default {
       })
     },
     checkedRoleTransfer (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         userId:this.$store.getters.userInfo.account, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
-        this.assigneeNewLoading = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.processNum()
           this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
@@ -1618,19 +1692,19 @@ export default {
     popoverHideCancel(){
       this.modalShowFlag1  = false
     },
-    // popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-    //   if(checkedData && checkedData.length != 0) {
+      if(checkedData && checkedData.length != 0) {
-    //     if(checkedData.length > 0 && checkedData.length != 0){
+        if(checkedData.length > 0 && checkedData.length != 0){
-    //       this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
-    //       this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
-    //     }else {
+        }else {
-    //       this.form.cycvppsbm = checkedData.code
+          this.form.cycvppsbm = checkedData.code
-    //       this.form.cycvppscn = checkedData.chineseName
+          this.form.cycvppscn = checkedData.chineseName
-    //     }
+        }
-    //     this.modalShowFlag2 = false
+        this.modalShowFlag2 = false
-    //   }
+      }
-    //
+
-    // },
+    },
     popoverHideBusVsCancel(){
       this.modalShowFlag2 = false
     },
@@ -1896,8 +1970,22 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
       })
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     assemble(ids,names){
       let list= new Array();
       if(ids && ids !== '' && names && names !== ''){
@@ -1939,33 +2027,16 @@ export default {
       }
     },
     processTable () {
-      this.$nextTick(() => {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-        Promise.all([this.getTaskId()]).then((value) => {
+        prcNum: this.$route.query.prcNum,
-          if(value[0] &&value.length > 0){
+        sortWord: this.shunxu ? this.paixu : "",
-            let mes = JSON.parse(value[0].mes)
+        shunxu: this.shunxu
-            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+      }, {
-            this.form = mes.form
+        loading: "loading",
-            this.taskIds = mes.taskIds;
+        _this: this
-            this.pId = mes.pId;
+      }, res => {
-            this.userId = mes.userId;
+        this.detailData = res
-            this.prcNum = mes.prcNum;
+      }, e => {
-            this.prcName = mes.prcName;
-            this.roleForm = mes.roleForm
-            this.commentText = mes.commentText
-          }
-          this.loading = true
-          this.$http.get('lawss/activiti/get_list_by_instance', {
-            prcNum: this.prcNum,
-            sortWord: this.shunxu ? this.paixu : '',
-            shunxu: this.shunxu
-          }, {
-            loading: 'loading',
-            _this: this
-          }, res => {
-            this.detailData = res
-            this.loading = false
-          }, e => {})
-        })
       })
     },
   },
@@ -2002,6 +2073,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }

src/pages/processCenter/pages/phone/qbrk-product/step7.vue

@@ -139,39 +139,31 @@
           <div class="block" style="padding-top: 20px;" v-show="active === '3'">
             <div class="flow-list">
               <el-table
-                height="100%"
+                :height="tablePHeight"
                 ref="selection"
                 :data="detailData"
                 tooltip-effect="dark"
-                style="width: 100%"
+                style="width: 100%;"
                 border
                 row-key="id"
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
               >
-                <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-                </el-table-column>
                 <el-table-column
                   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
                   prop="createTime"
                   label="创建时间"
-                  sortable="custom"
                   align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -349,7 +341,6 @@ export default {
         }]
       },
       loading: false,
-      drawerModal: false,
       dataLoading: true,
       disabledState: true,
       taskInfo:'标准化复审',
@@ -404,6 +395,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      tablePHeight:'',
       tableHeight: {
         standardTableHeight: null
       },
@@ -483,6 +475,7 @@ export default {
       multipleFlag2:'',
       url:'',
       urlChild:'',
+      drawerModal: false,
       drawerTitle: '', //drawer标题
       showCheckBox: true, // 树形控件是否展示多选框
       nodeKey: 'id',
@@ -1964,19 +1957,21 @@ export default {
       }
     },
     checkedRoleTransfer (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         userId:this.$store.getters.userInfo.account, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
-        this.assigneeNewLoading = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.processNum()
           this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
@@ -2079,6 +2074,10 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
+
       })
     },
     assemble(ids,names){
@@ -2143,34 +2142,27 @@ export default {
         })
       }
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     processTable () {
-      this.$nextTick(() => {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-        Promise.all([this.getTaskId()]).then((value) => {
+        prcNum: this.$route.query.prcNum,
-          if(value[0] &&value.length > 0){
+        sortWord: this.shunxu ? this.paixu : "",
-            let mes = JSON.parse(value[0].mes)
+        shunxu: this.shunxu
-            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+      }, {
-            this.form = mes.form
+        loading: "loading",
-            this.taskIds = mes.taskIds;
+        _this: this
-            this.pId = mes.pId;
+      }, res => {
-            this.userId = mes.userId;
+        this.detailData = res
-            this.prcNum = mes.prcNum;
+      }, e => {
-            this.prcName = mes.prcName;
-            this.roleForm = mes.roleForm
-            this.commentText = mes.commentText
-          }
-          this.loading = true
-          this.$http.get('lawss/activiti/get_list_by_instance', {
-            prcNum: this.prcNum,
-            sortWord: this.shunxu ? this.paixu : '',
-            shunxu: this.shunxu
-          }, {
-            loading: 'loading',
-            _this: this
-          }, res => {
-            this.detailData = res
-            this.loading = false
-          }, e => {})
-        })
       })
     },
   },
@@ -2208,6 +2200,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }

src/pages/processCenter/pages/phone/qbrk-product/step8.vue

@@ -139,39 +139,31 @@
           <div class="block" style="padding-top: 20px;" v-show="active === '3'">
             <div class="flow-list">
               <el-table
-                height="100%"
+                :height="tablePHeight"
                 ref="selection"
                 :data="detailData"
                 tooltip-effect="dark"
-                style="width: 100%"
+                style="width: 100%;"
                 border
                 row-key="id"
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
               >
-                <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-                </el-table-column>
                 <el-table-column
                   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
                   prop="createTime"
                   label="创建时间"
-                  sortable="custom"
                   align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -330,7 +322,6 @@ export default {
         }]
       },
       loading: false,
-      drawerModal: false,
       assigneeNewLoading: false,
       dataLoading: true,
       disabledState: true,
@@ -385,6 +376,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      tablePHeight:'',
       tableHeight: {
         standardTableHeight: null
       },
@@ -464,6 +456,7 @@ export default {
       multipleFlag2:'',
       url:'',
       urlChild:'',
+      drawerModal: false,
       drawerTitle: '', //drawer标题
       showCheckBox: true, // 树形控件是否展示多选框
       nodeKey: 'id',
@@ -901,19 +894,21 @@ export default {
       })
     },
     checkedRoleTransfer (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         userId:this.$store.getters.userInfo.account, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
-        this.assigneeNewLoading = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.processNum()
           this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
@@ -1699,6 +1694,19 @@ export default {
     popoverHideCancel(){
       this.modalShowFlag1  = false
     },
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData && checkedData.length != 0) {
+        if(checkedData.length > 0 && checkedData.length != 0){
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.form.cycvppsbm = checkedData.code
+          this.form.cycvppscn = checkedData.chineseName
+        }
+        this.modalShowFlag2 = false
+      }
+
+    },
     popoverHideBusVsCancel(){
       this.modalShowFlag2 = false
     },
@@ -1964,8 +1972,21 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
       })
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     assemble(ids,names){
       let list= new Array();
       if(ids && ids !== '' && names && names !== ''){
@@ -2007,33 +2028,16 @@ export default {
       }
     },
     processTable () {
-      this.$nextTick(() => {
+      this.$http.get("lawss/activiti/get_list_by_instance", {
-        Promise.all([this.getTaskId()]).then((value) => {
+        prcNum: this.$route.query.prcNum,
-          if(value[0] &&value.length > 0){
+        sortWord: this.shunxu ? this.paixu : "",
-            let mes = JSON.parse(value[0].mes)
+        shunxu: this.shunxu
-            mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
+      }, {
-            this.form = mes.form
+        loading: "loading",
-            this.taskIds = mes.taskIds;
+        _this: this
-            this.pId = mes.pId;
+      }, res => {
-            this.userId = mes.userId;
+        this.detailData = res
-            this.prcNum = mes.prcNum;
+      }, e => {
-            this.prcName = mes.prcName;
-            this.roleForm = mes.roleForm
-            this.commentText = mes.commentText
-          }
-          this.loading = true
-          this.$http.get('lawss/activiti/get_list_by_instance', {
-            prcNum: this.prcNum,
-            sortWord: this.shunxu ? this.paixu : '',
-            shunxu: this.shunxu
-          }, {
-            loading: 'loading',
-            _this: this
-          }, res => {
-            this.detailData = res
-            this.loading = false
-          }, e => {})
-        })
       })
     },
   },
@@ -2070,6 +2074,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }

src/pages/processCenter/pages/phone/qbrk/common/formList.vue

@@ -5,12 +5,12 @@
   </ProcessTitle>
   <div class="prc-content-border">
     <el-row :gutter="24">
-      <el-col :span="24">
+      <el-col :span="12">
         <el-form-item label="企标类别" prop="standSort" class="add-form-item form-item-disabled">
           <el-select v-model="form.standSort" filterable clearable placeholder="" :disabled="disabledState" style="appearance: none">
             <el-option
-                    v-for="(item, index) in standSortOptions"
+                    v-for="item in standSortOptions"
-                    :key="index"
+                    :key="item.value"
                     :value="item.value"
                     :label="item.label"
             ></el-option>
@@ -46,7 +46,24 @@
         <!--                                               clearable></el-datePicker>-->
         <!--                            </el-form-item>-->
       </el-col>
-      <el-col :span="24">
+      <el-col :span="12">
+        <!--                              <el-form-item label="国家/地区" prop="country" class="add-form-item form-item-disabled">-->
+        <!--                                <el-select :popper-append-to-body="false" v-model="form.country" multiple  placeholder="国家/地区">-->
+        <!--                                  <el-option-->
+        <!--                                      v-for="item in countryOptions"-->
+        <!--                                      placeholder="请选择"-->
+        <!--                                      :key="item.value"-->
+        <!--                                      :value="item.value"-->
+        <!--                                      :label="item.label"-->
+        <!--                                  ></el-option>-->
+        <!--                                </el-select>-->
+        <!--                              </el-form-item>-->
+        <!--                            <el-form-item label="企标编号" prop="standNumber" class="add-form-item form-item-disabled">-->
+        <!--                                <el-input-->
+        <!--                                        v-model="form.standNumber" :disabled="disabledState"-->
+        <!--                                        clearable-->
+        <!--                                ></el-input>-->
+        <!--                            </el-form-item>-->
         <el-form-item v-show="verifySarStandard" label="企标实施日期" prop="putTime" class="add-form-item form-item-disabled">
           <el-datePicker v-model="form.putTime" :disabled="disabledState"
                          :editable="false"></el-datePicker>
@@ -80,20 +97,24 @@
   </ProcessTitle>
   <div class="prc-content-border"  v-show="verifySarStandard">
     <el-row :gutter="24">
-      <el-col :span="24">
+      <el-col :span="12">
         <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+          <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
+<!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+<!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+<!--            {{value.name}}-->
+<!--          </div>-->
         </el-form-item>
         <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+          <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
 <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -102,20 +123,24 @@
 <!--          </div>-->
         </el-form-item>
       </el-col>
-      <el-col :span="24">
+      <el-col :span="12">
         <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+          <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
+<!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
+<!--            &lt;!&ndash; {{ value.name }} &ndash;&gt;-->
+<!--            {{value.name}}-->
+<!--          </div>-->
         </el-form-item>
         <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+          <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
 <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -131,7 +156,7 @@
   </ProcessTitle>
   <div class="prc-content-border"  v-show="verifySarStandard">
     <el-row :gutter="24">
-      <el-col :span="24">
+      <el-col :span="12">
         <el-form-item label="起草部门" prop="QCDW" class="add-form-item form-item-disabled">
           <el-input v-model="form.QCDW"  :disabled="disabledState" clearable></el-input>
         </el-form-item>
@@ -158,14 +183,17 @@
         <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+        <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
           <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
         </el-form-item>
+          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+              <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+          </el-form-item>
         <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="24">
+      <el-col :span="12">
         <el-form-item label="起草人" prop="QCRBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.QCRBUSS"  :title="form.QCRBUSS" :disabled="disabledState" clearable></el-input>
         </el-form-item>
@@ -195,9 +223,12 @@
         <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
         </el-form-item>
-        <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+        <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
           <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
         </el-form-item>
+        <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+              <el-input v-model="form.CYCDYMCBUSS" clearable :disabled="true"></el-input>
+        </el-form-item>
       </el-col>
     </el-row>
   </div>
@@ -206,7 +237,7 @@
   </ProcessTitle>
   <div class="prc-content-border"  v-show="verifySarStandard">
     <el-row :gutter="24">
-      <el-col :span="24">
+      <el-col :span="12">
         <el-form-item label="代替企标编号" prop="DTQBBHBUSS" class="add-form-item form-item-disabled">
           <el-input
                   v-model="form.DTQBBHBUSS" :disabled="disabledState"
@@ -226,7 +257,7 @@
           ></el-input>
         </el-form-item>
       </el-col>
-      <el-col :span="24">
+      <el-col :span="12">
 <!--        <el-form-item label="被代替企标编号" prop="BDTWJHLAWS" class="add-form-item form-item-disabled">-->
 <!--          <el-input-->
 <!--                  v-model="form.BDTWJHLAWS" :disabled="disabledState"-->
@@ -252,10 +283,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-          <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+          <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-            <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+            <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-            <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+            <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
           </div>
 <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -282,7 +313,7 @@
               default-expand-all>
           <el-table-column
                   label="序号"
-                  min-width="10%"
+                  min-width="6%"
                   align="center">
               <template slot-scope="scope">
                   {{scope.$index + 1}}
@@ -291,7 +322,7 @@
           <el-table-column
                   prop="modelNum"
                   label="条款号"
-                  min-width="15%"
+                  min-width="8%"
                   align="center"
           >
           </el-table-column>
@@ -299,7 +330,7 @@
                   prop="modelUpdBefore"
                   label="修改前"
                   align="center"
-                  min-width="25%">
+                  min-width="20%">
 <!--              <template slot-scope="scope">-->
 <!--                  <el-form-item-->
 <!--                          style="margin-left: 0;margin-bottom:0;"-->
@@ -312,7 +343,7 @@
                   prop="modelUpdAfter"
                   label="修改后"
                   align="center"
-                  min-width="25%">
+                  min-width="20%">
 <!--              <template slot-scope="scope">-->
 <!--                  <el-form-item-->
 <!--                          style="margin-left: 0;margin-bottom:0;"-->
@@ -325,7 +356,7 @@
                   prop="modelContent"
                   label="修改理由"
                   align="center"
-                  min-width="25%">
+                  min-width="20%">
 <!--              <template slot-scope="scope">-->
 <!--                  <el-form-item-->
 <!--                          style="margin-left: 0;margin-bottom:0;"-->
@@ -338,7 +369,7 @@
                   prop="zrDeptIdName"
                   label="提出部门"
                   align="center"
-                  min-width="20%">
+                  min-width="15%">
               <!--                                <template slot-scope="scope">-->
               <!--                                    <el-form-item-->
               <!--                                            style="margin-left: 0;margin-bottom:0;"-->
@@ -350,7 +381,7 @@
           <el-table-column
                   prop="zrUserIdName"
                   label="责任人"
-                  min-width="20%"
+                  min-width="14%"
                   align="center">
               <!--                                <template slot-scope="scope">-->
               <!--                                    <el-form-item-->
@@ -362,7 +393,7 @@
           </el-table-column>
         <el-table-column
                 label="意见是否采纳"
-                min-width="20%"
+                min-width="15%"
                 align="center">
           <template slot-scope="scope">
             {{filterOp(scope.row.opinionsAdopted)}}
@@ -384,7 +415,7 @@
                   prop="opinionsAdoptedCont"
                   label="采纳理由"
                   align="center"
-                  min-width="20%">
+                  min-width="15%">
 <!--                  <template slot-scope="scope">-->
 <!--                      <el-form-item-->
 <!--                              style="margin-left: 0;margin-bottom:0;"-->
@@ -397,11 +428,11 @@
         <el-row :gutter="24">
             <el-col :span="12">
               <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-                  <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+                  <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-                      <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+                      <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-                      <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+                      <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                        <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
-                  </span>
+                      </span>
                   </div>
               </el-form-item>
             </el-col>
@@ -474,6 +505,13 @@ export default {
       }
       return value
     },
+      ellipsis2 (value) {
+          if (!value) return ''
+          if (value.length > 12) {
+              return value.slice(0,12) + '...'
+          }
+          return value
+      },
       ellipsis22 (value) {
           if (!value) return ''
           if (value.length > 22) {
@@ -633,5 +671,7 @@ export default {
 </script>
 
 <style scoped>
-
+    /deep/ .fileClass{
+        line-height: 22px !important;
+    }
 </style>

src/pages/processCenter/pages/phone/qbrk/common/formListIn.vue

@@ -110,10 +110,10 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="发布稿" prop="FBGBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="FBGBUSSFileList.length > 0" v-for="(item,index) in FBGBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="FBGBUSSFileList.length>0" v-for="(value,index)  in this.FBGBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -122,10 +122,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="历史版本" prop="LSBBBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="LSBBBUSSFileList.length > 0" v-for="(item,index) in LSBBBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="LSBBBUSSFileList.length>0" v-for="(value,index)  in this.LSBBBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -136,10 +136,10 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="编制说明" prop="BZSMBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="BZSMBUSSFileList.length > 0" v-for="(item,index) in BZSMBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="BZSMBUSSFileList.length>0" v-for="(value,index)  in this.BZSMBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -148,10 +148,10 @@
             <!--          </div>-->
           </el-form-item>
           <el-form-item label="其他文件" prop="QTWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="QTWJBUSSFileList.length > 0" v-for="(item,index) in QTWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="QTWJBUSSFileList.length>0" v-for="(value,index)  in this.QTWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -194,9 +194,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" title="关联模块--卡车VPPS编码" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSBMBUSS"  :disabled="disabledState"></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元变型号" title="模块结构单元变型号" class="add-form-item form-item-disabled">
+          <el-form-item label="模块结构单元变型号(卡车)" title="模块结构单元变型号(卡车)" class="add-form-item form-item-disabled">
             <el-input v-model="form.DYBXHBUSS"  :disabled="disabledState"></el-input>
           </el-form-item>
+          <el-form-item label="模块结构单元变型号(乘用车)" title="模块结构单元变型号(乘用车)" class="add-form-item form-item-disabled">
+            <el-input v-model="form.CYCDYBXHBUSS"  :disabled="disabledState"></el-input>
+          </el-form-item>
           <el-form-item label="体系类别" prop="TXLBBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.TXLBBUSS"  :disabled="disabledState" clearable></el-input>
           </el-form-item>
@@ -231,9 +234,12 @@
           <el-form-item label="关联模块--卡车VPPS编码" prop="KCVPPSCNBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.KCVPPSCNBUSS" clearable :disabled="true"></el-input>
           </el-form-item>
-          <el-form-item label="模块结构单元名称" prop="DYMCBUSS" class="add-form-item form-item-disabled">
+          <el-form-item label="模块结构单元名称(卡车)" prop="DYMCBUSS" class="add-form-item form-item-disabled">
             <el-input v-model="form.DYMCBUSS" clearable :disabled="true"></el-input>
           </el-form-item>
+          <el-form-item label="模块结构单元名称(乘用车)" prop="CYCDYMCBUSS" class="add-form-item form-item-disabled">
+            <el-input v-model="form.CYCDYMCBUSS" clearable :disabled="true"></el-input>
+          </el-form-item>
         </el-col>
       </el-row>
     </div>
@@ -287,10 +293,10 @@
             </el-select>
           </el-form-item>
           <el-form-item label="关联文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="GLWJBUSSFileList.length > 0" v-for="(item,index) in GLWJBUSSFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
             <!--          <div  v-if="GLWJBUSSFileList.length>0" v-for="(value,index)  in this.GLWJBUSSFileList" :key="index" style="cursor: pointer;color: #00b7ee"  @click="downloadFile(value)">-->
@@ -432,10 +438,10 @@
       <el-row :gutter="24">
         <el-col :span="12">
           <el-form-item label="汇总评审意见文件" prop="GLWJBUSSName" class="add-form-item form-item-disabled">
-            <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer" class="fileClass">
+            <div v-if="summaryFileList.length > 0" v-for="(item,index) in summaryFileList" :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;margin-top: 13px" class="fileClass">
-              <span style="width: 80%;" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name | ellipsis22 }}</span>
+              <span style="" @click="handleFilePreview(item,'preview')" :title="item.name"> {{ item.name  }}</span>
-              <span style="width: 20%;margin-left: 15px;" v-if="item.id !== ''">
+              <span style="margin-left: 7px;" v-if="item.id !== ''">
-                        <el-button type="primary" size="mini" plain icon="el-icon-download"  @click="handleFilePreview(item,'down')"></el-button>
+                    <i class="el-icon-download" title="下载" @click="handleFilePreview(item,'down')"></i>
                   </span>
             </div>
           </el-form-item>
@@ -509,6 +515,13 @@
         }
         return value
       },
+      ellipsis2 (value) {
+        if (!value) return ''
+        if (value.length > 12) {
+          return value.slice(0,12) + '...'
+        }
+        return value
+      },
       ellipsis22 (value) {
         if (!value) return ''
         if (value.length > 22) {
@@ -668,5 +681,7 @@
 </script>
 
 <style scoped>
-
+  /deep/ .fileClass{
+    line-height: 22px !important;
+  }
 </style>

src/pages/processCenter/pages/phone/qbrk/step10.vue

@@ -65,10 +65,89 @@
               </el-collapse>
             </div>
           </div>
+          <!--            <div class="block" id="active2" v-show="active === '2'">-->
+          <!--                <ProcessTitle>-->
+          <!--                    <template slot="title">模块信息</template>-->
+          <!--                </ProcessTitle>-->
+          <!--                <template>-->
+          <!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
+          <!--                        <div class="action-bar">-->
+          <!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+          <!--                                批量编辑-->
+          <!--                            </el-button>-->
+          <!--                            <el-button-->
+          <!--                                    type="primary"-->
+          <!--                                    size="mini"-->
+          <!--                                    class="common-button-primary add-button"-->
+          <!--                                    @click="createRow"-->
+          <!--                            >创建模块</el-button>-->
+          <!--                        </div>-->
+          <!--                        <el-table-->
+          <!--                                ref="selection"-->
+          <!--                                tooltip-effect="dark"-->
+          <!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
+          <!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
+          <!--                                        fontWeight: 'bold', height: '48px'}"-->
+          <!--                                @selection-change="handleSelectionChange"-->
+          <!--                                row-key="id"-->
+          <!--                                :data="form.modelData"-->
+          <!--                                border-->
+          <!--                                default-expand-all-->
+          <!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+          <!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+          <!--                            <el-table-column-->
+          <!--                                    prop="modelNum"-->
+          <!--                                    label="序号"-->
+          <!--                                    min-width="15%"-->
+          <!--                                    align="center"-->
+          <!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+          <!--                            </el-table-column>-->
+          <!--                            <el-table-column-->
+          <!--                                    label="名称"-->
+          <!--                                    align="center"-->
+          <!--                                    min-width="30%">-->
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+          <!--                            </el-table-column>-->
+          <!--                            <el-table-column-->
+          <!--                                    label="责任人"-->
+          <!--                                    min-width="15%"-->
+          <!--                                    align="center">-->
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+          <!--                            </el-table-column>-->
+          <!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <div @click.stop style="display: inline-block">-->
+          <!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
+          <!--                                            <i class="iconfont">&#xe61e;</i>-->
+          <!--                                            <el-dropdown-menu slot="dropdown">-->
+          <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
+          <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
+          <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
+          <!--                                            </el-dropdown-menu>-->
+          <!--                                        </el-dropdown>-->
+          <!--                                    </div>-->
+          <!--                                </template>-->
+          <!--                            </el-table-column>-->
+          <!--                        </el-table>-->
+          <!--                    </div>-->
+          <!--                </template>-->
+          <!--            </div>-->
           <div class="block" style="padding-top: 20px;" v-show="active === '3'">
             <div class="flow-list">
               <el-table
-                height="100%"
+                :height="tablePHeight"
                 ref="selection"
                 :data="detailData"
                 tooltip-effect="dark"
@@ -78,29 +157,21 @@
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
               >
-                <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-                </el-table-column>
                 <el-table-column
                   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
                   prop="createTime"
                   label="创建时间"
-                  sortable="custom"
                   align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -255,7 +326,6 @@ export default {
       },
       loading: false,
       dataLoading: true,
-      drawerModal: false,
       assigneeNewLoading: false,
       disabledState: true,
       userId:this.$store.getters.userInfo.account,
@@ -310,6 +380,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      tablePHeight:'',
       tableHeight: {
         standardTableHeight: null
       },
@@ -389,6 +460,7 @@ export default {
       multipleFlag2:'',
       url:'',
       urlChild:'',
+      drawerModal: false,
       drawerTitle: '', //drawer标题
       showCheckBox: true, // 树形控件是否展示多选框
       nodeKey: 'id',
@@ -821,19 +893,21 @@ export default {
       }
     },
     checkedRoleTransfer (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         userId:this.$store.getters.userInfo.account, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
-        this.assigneeNewLoading = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.processNum()
           this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
@@ -1619,6 +1693,19 @@ export default {
     popoverHideCancel(){
       this.modalShowFlag1  = false
     },
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData && checkedData.length != 0) {
+        if(checkedData.length > 0 && checkedData.length != 0){
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.form.cycvppsbm = checkedData.code
+          this.form.cycvppscn = checkedData.chineseName
+        }
+        this.modalShowFlag2 = false
+      }
+
+    },
     popoverHideBusVsCancel(){
       this.modalShowFlag2 = false
     },
@@ -1883,8 +1970,21 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
       })
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     assemble(ids,names){
       let list= new Array();
       if(ids && ids !== '' && names && names !== ''){
@@ -1989,6 +2089,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }

src/pages/processCenter/pages/phone/qbrk/step11.vue

@@ -65,10 +65,89 @@
               </el-collapse>
             </div>
           </div>
+          <!--            <div class="block" id="active2" v-show="active === '2'">-->
+          <!--                <ProcessTitle>-->
+          <!--                    <template slot="title">模块信息</template>-->
+          <!--                </ProcessTitle>-->
+          <!--                <template>-->
+          <!--                    <div class="prc-content-border" style="height: 66vh;position: relative;">-->
+          <!--                        <div class="action-bar">-->
+          <!--                            <el-button type="primary" class="common-button-primary add-button" size="mini" @click="choiceZRRS('', 2, '')">-->
+          <!--                                批量编辑-->
+          <!--                            </el-button>-->
+          <!--                            <el-button-->
+          <!--                                    type="primary"-->
+          <!--                                    size="mini"-->
+          <!--                                    class="common-button-primary add-button"-->
+          <!--                                    @click="createRow"-->
+          <!--                            >创建模块</el-button>-->
+          <!--                        </div>-->
+          <!--                        <el-table-->
+          <!--                                ref="selection"-->
+          <!--                                tooltip-effect="dark"-->
+          <!--                                style="width: 100%;margin-bottom: 20px;overflow-y:auto;height:56vh;border-bottom: 1px solid #EBEEF5;"-->
+          <!--                                :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px',-->
+          <!--                                        fontWeight: 'bold', height: '48px'}"-->
+          <!--                                @selection-change="handleSelectionChange"-->
+          <!--                                row-key="id"-->
+          <!--                                :data="form.modelData"-->
+          <!--                                border-->
+          <!--                                default-expand-all-->
+          <!--                                :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+          <!--                            <el-table-column type="selection" min-width="5%" :selectable="checkSelect" align="center"/>-->
+          <!--                            <el-table-column-->
+          <!--                                    prop="modelNum"-->
+          <!--                                    label="序号"-->
+          <!--                                    min-width="15%"-->
+          <!--                                    align="center"-->
+          <!--                                    :tree-props="{children: 'children', hasChildren: 'hasChildren'}">-->
+          <!--                            </el-table-column>-->
+          <!--                            <el-table-column-->
+          <!--                                    label="名称"-->
+          <!--                                    align="center"-->
+          <!--                                    min-width="30%">-->
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.modelName" :disabled="scope.row.disabled"  placeholder="请维护模块名称" @blur="modelNameFunc(scope.row)"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+          <!--                            </el-table-column>-->
+          <!--                            <el-table-column-->
+          <!--                                    label="责任人"-->
+          <!--                                    min-width="15%"-->
+          <!--                                    align="center">-->
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <el-form-item-->
+          <!--                                            style="margin-left: 0;margin-bottom:0;"-->
+          <!--                                    >-->
+          <!--                                        <el-input v-model="scope.row.zrUserIdName" v-if="scope.row.pid === '0'" placeholder="请选择责任人" @click.native="choiceZRRS(scope.row.zrUserId, 1, scope.$index)"/>-->
+          <!--                                    </el-form-item>-->
+          <!--                                </template>-->
+          <!--                            </el-table-column>-->
+          <!--                            <el-table-column label="操作" align="center"  min-width="5%">-->
+          <!--                                <template slot-scope="scope">-->
+          <!--                                    <div @click.stop style="display: inline-block">-->
+          <!--                                        <el-dropdown trigger="click" @command="handleCommand">-->
+          <!--                                            <i class="iconfont">&#xe61e;</i>-->
+          <!--                                            <el-dropdown-menu slot="dropdown">-->
+          <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '新增']" v-btn-permission="''">新增</el-dropdown-item>-->
+          <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '维护']" v-btn-permission="''">维护</el-dropdown-item>-->
+          <!--                                                <el-dropdown-item :command="[scope.$index,scope.row, '删除']" v-btn-permission="''">删除</el-dropdown-item>-->
+          <!--                                            </el-dropdown-menu>-->
+          <!--                                        </el-dropdown>-->
+          <!--                                    </div>-->
+          <!--                                </template>-->
+          <!--                            </el-table-column>-->
+          <!--                        </el-table>-->
+          <!--                    </div>-->
+          <!--                </template>-->
+          <!--            </div>-->
           <div class="block" style="padding-top: 20px;" v-show="active === '3'">
             <div class="flow-list">
               <el-table
-                height="100%"
+                :height="tablePHeight"
                 ref="selection"
                 :data="detailData"
                 tooltip-effect="dark"
@@ -78,29 +157,21 @@
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
               >
-                <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-                </el-table-column>
                 <el-table-column
                   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
                   prop="createTime"
                   label="创建时间"
-                  sortable="custom"
                   align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -255,7 +326,6 @@ export default {
       },
       loading: false,
       dataLoading: true,
-      drawerModal: false,
       assigneeNewLoading: false,
       disabledState: true,
       userId:this.$store.getters.userInfo.account,
@@ -310,6 +380,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      tablePHeight:'',
       tableHeight: {
         standardTableHeight: null
       },
@@ -389,6 +460,7 @@ export default {
       multipleFlag2:'',
       url:'',
       urlChild:'',
+      drawerModal: false,
       drawerTitle: '', //drawer标题
       showCheckBox: true, // 树形控件是否展示多选框
       nodeKey: 'id',
@@ -413,7 +485,6 @@ export default {
         modelDataZrUserVerify:[],
         summaryFile:'',
         summaryFileName:'',
-        // 基础信息
         country:[],
         // 基础信息
         standSort: '',
@@ -821,19 +892,21 @@ export default {
       }
     },
     checkedRoleTransfer (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         userId:this.$store.getters.userInfo.account, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
-        this.assigneeNewLoading = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.processNum()
           this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
@@ -1619,6 +1692,19 @@ export default {
     popoverHideCancel(){
       this.modalShowFlag1  = false
     },
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData && checkedData.length != 0) {
+        if(checkedData.length > 0 && checkedData.length != 0){
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.form.cycvppsbm = checkedData.code
+          this.form.cycvppscn = checkedData.chineseName
+        }
+        this.modalShowFlag2 = false
+      }
+
+    },
     popoverHideBusVsCancel(){
       this.modalShowFlag2 = false
     },
@@ -1680,7 +1766,7 @@ export default {
 
       this.saveLoading = true
       let _formData = new FormData()
-      _formData.append('id', this.bpnId || '')
+      // _formData.append('id', this.bpnId)
       _formData.append('createUser', this.$store.getters.userInfo.account)
       _formData.append('createUserName', this.$store.getters.userInfo.uName)
       _formData.append('prcType', 'laws1')
@@ -1700,7 +1786,7 @@ export default {
       saveTaskFirst(_formData).then(res => {
         this.saveLoading = false
         this.$message.success('保存成功')
-        this.bpnId = res.result
+        // this.bpnId = res.result
       }).catch(e => {
         this.saveLoading = false
       })
@@ -1883,8 +1969,21 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
       })
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     assemble(ids,names){
       let list= new Array();
       if(ids && ids !== '' && names && names !== ''){
@@ -1989,6 +2088,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }

src/pages/processCenter/pages/phone/qbrk/step4.vue

@@ -59,6 +59,67 @@
               </el-collapse>
             </div>
           </div>
+          <div class="block" style="padding-top: 20px;" v-show="active === '3'">
+            <div class="flow-list">
+              <el-table
+                :height="tablePHeight"
+                ref="selection"
+                :data="detailData"
+                tooltip-effect="dark"
+                style="width: 100%"
+                border
+                row-key="id"
+                :no-data-text="listNoDataText"
+                :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
+              >
+                <el-table-column
+                  prop="name"
+                  label="任务步骤"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="assignee"
+                  label="任务受理人"
+                  align="center"
+                >
+                </el-table-column>
+                <el-table-column
+                  prop="createTime"
+                  label="创建时间"
+                  align="center">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="endTime"
+                  label="完成时间"
+                  align="center">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD') : '' }}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="comment"
+                  label="流程信息"
+                  align="center">
+                  <template slot-scope="scope">
+                    <span>{{scope.row.commentText}}</span>
+                  </template>
+                </el-table-column>
+                <el-table-column
+                  prop="completeFlag"
+                  label="状态"
+                  align="center">
+                  <template slot-scope="scope">
+                    <span>{{ scope.row.endTime ? '已完成' : '未完成'}}</span>
+                  </template>
+                </el-table-column>
+              </el-table>
+              <loading :loading="loading">流程列表加载中</loading>
+            </div>
+          </div>
         </el-form>
       </div>
     </div>
@@ -542,6 +603,426 @@ export default {
       ListForm: {}, // 新增数据
     }
   },
+  data () {
+    const validateZrUserIdName = (rule, value, callback) => {
+      if(this.FBGBUSSFileList.length === 0){
+        callback(new Error('请上传发布稿文件！'))
+      }
+      // callback()
+    };
+
+    const validateModelName = (rule, value, callback) => {
+      if(this.FBGBUSSFileList.length === 0){
+        callback(new Error('请上传发布稿文件！'))
+      }
+      // callback()
+    };
+    const validateFBGBUSS = (rule, value, callback) => {
+      if(this.FBGBUSSFileList.length === 0){
+        callback(new Error('请上传发布稿文件！'))
+      }
+      callback()
+    };
+    const validateBZSMBUSS = (rule, value, callback) => {
+      if(this.BZSMBUSSFileList.length === 0){
+        callback(new Error('请上传编辑说明文件！'))
+      }
+      callback()
+    };
+    return {
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近三个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+      loading: false,
+      dataLoading: true,
+      drawerModal: false,
+      assigneeNewLoading: false,
+      disabledState: true,
+      userId:this.$store.getters.userInfo.account,
+      taskIds: this.$route.query.taskIds,
+      pId: this.$route.query.prcId,
+      bpnId: this.$route.query.bpnId,
+      prcNum: this.$route.query.prcNum,
+      prcName: this.$route.query.prcName,
+      detailData: [],
+      fileList: [],
+      FBGBUSSFileList: [],
+      BZSMBUSSFileList: [],
+      LSBBBUSSFileList: [],
+      QTWJBUSSFileList: [],
+      GLWJBUSSFileList: [],
+      caFileList: [],
+      FBGBJBDFileList: [],
+      xgdFileList: [],
+      ZCWBLAWSFileList: [],
+      GCWBLAWSFileList: [],
+      JDWJLAWSFileList: [],
+      GLWJLAWSFileList: [],
+      ssgFileList: [],
+      zqyjgFileList: [],
+      jdwjFileList: [],
+      zbjbdFileList: [],
+      kwjFileList: [],
+      glwjFileList: [],
+      filterText:'',
+      textStatusMap: {}, // 文本状态id与name对应
+      standardDrawer: false,
+      loadSarStandard: false,
+      verifySarStandard: true,
+      formTongGuo: {
+        approvalOpinion: '', // 通过/驳回
+        commentText: '', // 意见
+      },
+      standardSearchForm: {
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: 'INLAND',
+        standSort: '',
+        standName: '',
+        standEnName: '',
+        standNumber: ''
+      },
+      tableData: {
+        // 标准表格数据
+        standardData: [],
+        // 任务分解单数据
+        taskTableData: []
+      },
+      tablePHeight:'',
+      tableHeight: {
+        standardTableHeight: null
+      },
+      selectedList: [],
+      standardCheckedList: [],
+      activeName:'1',
+      roleRow: {},
+      commentText: '', // 意见
+      title: '', // 新增编辑抽屉标题
+      config: {
+        attrName : '',
+      },
+      dataSource: false,
+      replaceLawsNumModel: false,
+      replaceLawType: '',
+      sarBussionessLawsEO: {
+        replaceLawsNum: ''
+      },
+      // 代替标准号
+      replaceLawsNumForm: {
+        lawsNumber:'',
+        numberName:'',
+        lawsTextState:'',
+        dataSource: '',
+        standNumber: '', // 标准编号
+        page: 1,
+        pageSize: this.$store.getters.userInfo.configContent,
+        total: 0,
+        standType: 'BUSINESS',
+        quoteIdList: '',
+        validFlag: '0',
+        menuId: 'nomenu'
+      },
+      replaceLawsNumRow: [], // 代替政策号 数组内容
+      replaceTotal: 0,
+      selectedListRep: [],
+      replaceLoading: true,
+      replacePage: 1,
+      ListModel: false, // 新增编辑抽屉开关
+      active: '1', // 默认显示
+      isSubmit: false,
+      saveLoading: false,
+      defaultProps: {
+        children: 'children',
+        label: 'menuName'
+      },
+      defaultCodeProps: {
+        children: 'children',
+        label: 'code'
+      },
+      defaultModelProps: {
+        children: 'children',
+        label: 'model'
+      },
+      nodeList: [],
+      nodeList2: [],
+      zrType: '',
+      zrIndex: '',
+      zrIdList: [],
+      type: '',
+      defaultUserProps: {
+        children: 'children',
+        label: 'name'
+      },
+      key:1,
+      key1:2,
+      key2:3,
+      key3:4,
+      treeData: [], // 人员数据
+      modalShowFlag: false, // drawer开关
+      modalShowRoleFlag: false, // drawer开关
+      modalShowFlag1: false, // drawer开关
+      modalShowFlag2: false, // drawer开关
+      modalShowFlag3: false, // drawer开关
+      modalShowFlag4: false, // drawer开关
+      drawerTitle1:'',
+      multipleFlag2:'',
+      url:'',
+      urlChild:'',
+      drawerTitle: '', //drawer标题
+      showCheckBox: true, // 树形控件是否展示多选框
+      nodeKey: 'id',
+      defaultCheckedKeys: [],
+      nodeKeyCode: 'code',
+      nodeKeyModel: 'model',
+      defaultCheckedKeys1: [],
+      defaultCheckedKeys2: [],
+      defaultCheckedKeys3: [],
+      fileUrl: 'api/att/attFile/upload',
+      fileMadel: false,
+      fileType: '',
+      countryArr:'',
+      commentCycleDate:'',
+      form: {
+        fsRejectStatus:'',
+        planId:'',
+        planStatus:'',
+        reviseStatus:'',
+        modelData:[],
+        modelDataNameVerify:[],
+        modelDataZrUserVerify:[],
+        // 基础信息
+        country:[],
+        // 基础信息
+        standSort: '',
+        standCode: '',
+        standYear: '',
+        standName: '',
+        standEnName: '',
+        textStatusBuss: '',
+        issueTime: '',
+        putTime: '',
+        FZRQBUSS: '',
+        FSRQBUSS: '',
+        // 过程稿件
+        FBGBUSS: '',
+        FBGBUSSName: '',
+        BZSMBUSS: '',
+        BZSMBUSSName: '',
+        LSBBBUSS: '',
+        LSBBBUSSName: '',
+        QTWJBUSS: '',
+        QTWJBUSSName: '',
+        // 适用范围
+        QCDW: '',
+        QCRBUSS: '',
+        WJSCRYBUSS: this.$store.getters.userInfo.account,
+        WJSCRYBUSSName: this.$store.getters.userInfo.userName,
+        SYCXCLASS: '',
+        NYLXCLASS: '',
+        SYCPXCLASS: '',
+        TXLBBUSS: '',
+        VPPSBMBUSS: '',
+        VPPSCNBUSS: '',
+        KCVPPSBMBUSS: '',
+        KCVPPSCNBUSS: '',
+        CYCVPPSBMBUSS: '',
+        CYCVPPSCNBUSS: '',
+        DYBXHBUSS: '',
+        DYMCBUSS: '',
+        // 关联信息
+        DTQBBHBUSS: '',
+        BDTQBBHBUSS: '',
+        XGJLBUSS: '',
+        XGLC: '',
+        GLWJBUSS: '',
+        GLWJBUSSName: '',
+        XCSJBUSS: '',
+        CYCD:'',
+        CYBZ:'',
+        YYBZ:'',
+        standNum:'',
+      }, // 标准信息
+      roleForm:{
+        hzUserId: this.$store.getters.userInfo.account,
+        hzUserName: this.$store.getters.userInfo.userName,
+        xdUserId: this.$store.getters.userInfo.account,
+        xdUserName: this.$store.getters.userInfo.userName,
+        pxUserId: this.$store.getters.userInfo.account,
+        pxUserName: this.$store.getters.userInfo.userName,
+        fbUserId: '',
+        fbUserName: '',
+        qcUserId: '', // 多实例
+        qcUserName:'', // 多实例
+        bzhUserId:'',
+        bzhUserName:'',
+        hqUserId:'', // 多实例
+        hqUserName:'', // 多实例
+        fggcsUserId:'',
+        fggcsUserName:'',
+        jsfzrUserId:'',
+        jsfzrUserName:'',
+        bzUserId:'',
+        bzUserName:'',
+        fzrUserId:'',
+        fzrUserName:'',
+        zhrUserId:'',
+        zhrUserName:'',
+        zrUserId: '',
+        zrUserName: '',
+        jlUserId: '',
+        jlUserName: '',
+        applyUpdUserId: this.$store.getters.userInfo.account,
+        applyUpdUserName: this.$store.getters.userInfo.userName,
+        prcCreateUser: this.$store.getters.userInfo.account,
+        prcCreateUserName: this.$store.getters.userInfo.userName,
+      },
+      modelRules:{
+        zrUserIdName: [
+          { required: true, message: '请选择会签责任人', trigger: 'blur' },
+        ],
+        modelName: [
+          { required: true, message: '选择维护模块名称', trigger: 'blur' },
+        ],
+      },
+      roleRules:{
+        qcUserName: [
+          { required: true, message: '选择其他起草人', trigger: 'blur' },
+        ],
+        bzhUserName: [
+          { required: true, message: '选择标准化员', trigger: 'blur' },
+        ],
+        hqUserName: [
+          { required: true, message: '请选择会签责任人', trigger: 'blur' },
+        ],
+        fggcsUserName: [
+          { required: true, message: '选择技术委员会负责刃/起草中心主任', trigger: 'blur' },
+        ],
+        jsfzrUserName: [
+          { required: true, message: '选择技术委员会负责人/起草中心主任', trigger: 'blur' },
+        ],
+        bzUserName: [
+          { required: true, message: '选择标准法规部部长', trigger: 'blur' },
+        ],
+        fzrUserName: [
+          { required: true, message: '选择专委会副主任/起草单位中心主任', trigger: 'blur' },
+        ],
+        zhrUserName: [
+          { required: true, message: '选择专委会主任/总院院长或主管副院长', trigger: 'blur' },
+        ],
+      },
+      rules:{
+        commentText: [{ required: true, message: '请输入意见', trigger: 'blur' }],
+        approvalOpinion: [{ required: true, message: '请选择审批意见', trigger: 'change' }],
+        zrUserIdName: [
+          { required: true, message: '请选择会签责任人', validator: validateZrUserIdName,trigger: 'blur' },
+        ],
+        modelName: [
+          { required: true, message: '选择维护模块名称', validator: validateModelName,trigger: 'blur' },
+        ],
+        standSort: [
+          { required: true, message: '请选择企标类别', trigger: 'change' }
+        ],
+        standNumber: [
+          { required: true, message: '请输入企标编号', trigger: 'blur' },
+          { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
+        ],
+        standYear: [
+          { required: true, message: '请输入标准年份'},
+          { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
+        ],
+        standName: [
+          { required: true, message: '请输入企标中文名称', trigger: 'blur' },
+          { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
+          {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'}
+        ],
+        standEnName: [
+          { required: false, message: '请输入企标英文名称', trigger: 'blur' },
+          { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' },
+          {validator: this.verify.valiateEnName, trigger: 'change'}
+        ],
+        textStatusBuss: [
+          { required: true, message: '请选择文本状态', trigger: 'change' }
+        ],
+        issueTime: [
+          { required: false, message: '请选择企标发布日期', trigger: 'change'}
+        ],
+        putTime: [
+          { required: true, message: '请选择企标实施日期', trigger: 'change' }
+        ],
+        FBGBUSSName: [
+          { required: true, message: '请上传发布稿',validator: validateFBGBUSS, trigger: 'blur' }
+        ],
+        BZSMBUSSName: [
+          { required: true, message: '请上传编制说明',validator: validateBZSMBUSS, trigger: 'blur' }
+        ],
+        QCDW: [
+          { required: true, message: '请选择起草部门', trigger: 'change' }
+        ],
+        QCRBUSS: [
+          { required: true, message: '请选择起草人', trigger: 'change' }
+        ],
+      },
+      zrUserIds: [], // 选择多个会签责任人
+      userType:'', // 选择用户ID判断
+      countryOptions:[],//国家地区
+      standSortOptions: [], // 标准类别
+      standNatureOptions: [], // 标准性质
+      standStateOptions: [], // 文本状态
+      standSystemOptions: [], // 标准体系
+      busVppsOptions: [], // 车系体系架构
+      busVppsChildOptions: [], // 车系体系架构子集合
+      modelOptions: [], // 模块体系架构
+      modelChildOptions: [], // 模块体系架构子集合
+      applyArcticOptions: [], // 适用车型
+      gkglbmOptions: [], // 归口管理部门
+      categoryOptions: [], // 能源类型
+      applyAuthOptions: [], // 适用认证
+      cysdOptions: [], // 我司参与深度
+      cbcdOptions: [], // 采标程度
+      wssmrOptions: [], // 我司署名人
+      sycpxOptions: [], // 适用产品线
+      zrbmOptions: [], // 责任部门
+      zrgcsOptions: [], // 责任工程师
+      qcdwOption: [], // 起草单位
+      txlbOptions: [], // 体系类别
+      standSortConfigOptions: [], // 标准类别下拉框
+      adoptExtentOptions: [], // 采标程度下拉框
+      emergyKindOptions: [], // 能源种类下拉框
+      categoryConfigOptions: [], // 所属类别下拉框
+      assemClassOptions: [], // 总成分类下拉框
+      qcdwOptions:[],//起草单位下拉框
+      qcrOptions:[],//起草人下拉框
+      nylxOptions:[],//能源类型下拉框
+      syrzOptions:[],//适用认证下拉框
+      data: [], // 标准列表数据
+      ListForm: {}, // 新增数据
+    }
+  },
   watch:{
     'form.issueTime': {
       handler: function() {
@@ -757,19 +1238,21 @@ export default {
       })
     },
     checkedRoleTransfer (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         userId:this.$store.getters.userInfo.account, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
-        this.assigneeNewLoading = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.processNum()
           this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
@@ -1541,19 +2024,6 @@ export default {
       this.modalShowFlag2 = false
       this.$forceUpdate()
     },
-    // popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-    //   if(checkedData && checkedData.length != 0) {
-    //     if(checkedData.length > 0 && checkedData.length != 0){
-    //       this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
-    //       this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
-    //     }else {
-    //       this.form.cycvppsbm = checkedData.code
-    //       this.form.cycvppscn = checkedData.chineseName
-    //     }
-    //     this.modalShowFlag2 = false
-    //   }
-    //
-    // },
     popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) {
       if(checkedData) {
         if(checkedData.length > 0){
@@ -1568,6 +2038,19 @@ export default {
     popoverHideCancel(){
       this.modalShowFlag1  = false
     },
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+      if(checkedData && checkedData.length != 0) {
+        if(checkedData.length > 0 && checkedData.length != 0){
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+        }else {
+          this.form.cycvppsbm = checkedData.code
+          this.form.cycvppscn = checkedData.chineseName
+        }
+        this.modalShowFlag2 = false
+      }
+
+    },
     popoverHideBusVsCancel(){
       this.modalShowFlag2 = false
     },
@@ -1833,8 +2316,21 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
       })
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     assemble(ids,names){
       let list= new Array();
       if(ids && ids !== '' && names && names !== ''){
@@ -1938,6 +2434,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }

src/pages/processCenter/pages/phone/qbrk/step8.vue

@@ -68,7 +68,7 @@
           <div class="block" style="padding-top: 20px;" v-show="active === '3'">
             <div class="flow-list">
               <el-table
-                height="100%"
+                :height="tablePHeight"
                 ref="selection"
                 :data="detailData"
                 tooltip-effect="dark"
@@ -78,29 +78,21 @@
                 :no-data-text="listNoDataText"
                 :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"
               >
-                <el-table-column
-                  type="selection"
-                  width="55"
-                  align="center">
-                </el-table-column>
                 <el-table-column
                   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
                   prop="createTime"
                   label="创建时间"
-                  sortable="custom"
                   align="center">
                   <template slot-scope="scope">
                     <span>{{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD') : '' }}</span>
@@ -274,7 +266,6 @@ export default {
       },
       loading: false,
       dataLoading: true,
-      drawerModal: false,
       taskInfo:'批准',
       assigneeNewLoading: false,
       disabledState: true,
@@ -330,6 +321,7 @@ export default {
         // 任务分解单数据
         taskTableData: []
       },
+      tablePHeight:'',
       tableHeight: {
         standardTableHeight: null
       },
@@ -409,6 +401,7 @@ export default {
       multipleFlag2:'',
       url:'',
       urlChild:'',
+      drawerModal: false,
       drawerTitle: '', //drawer标题
       showCheckBox: true, // 树形控件是否展示多选框
       nodeKey: 'id',
@@ -481,7 +474,7 @@ export default {
         GLWJBUSS: '',
         GLWJBUSSName: '',
         XCSJBUSS: '',
-        CBCD:'',
+        CYCD:'',
         CYBZ:'',
         YYBZ:'',
         standNum:'',
@@ -929,19 +922,21 @@ export default {
       }
     },
     checkedRoleTransfer (data) {
-      this.assigneeNewLoading = true
+      this.isSubmit = true
+      this.saveLoading = true
       changeAssigneeNew({
         taskId: this.$route.query.taskIds, // 任务id
         userId:this.$store.getters.userInfo.account, // 委托人
         assignee: data[0].id, // 被委托人
         pId: this.$route.query.prcId, // 流程实例
       }).then(res => {
-        this.assigneeNewLoading = false
+        this.isSubmit = false
+        this.saveLoading = false
         if (res.success) {
           this.drawerModal = false
           this.$message.success('调整成功')
-          this.processNum()
           this.$router.push({path:'/processCenter?tabsName=ProcessCenter'})
+          this.processNum()
         } else {
           this.$message.warning(res.message)
         }
@@ -999,6 +994,9 @@ export default {
           let mes = JSON.parse(res.mes)
           mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD'))
           this.form = mes.form
+          this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+          this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+          this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
           this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName);
           this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName);
           this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName);
@@ -1006,7 +1004,7 @@ export default {
           this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName);
           this.summaryFileList=this.assemble(this.form.summaryFile,this.form.summaryFileName);
           this.roleForm = mes.roleForm
-          this.commentText = mes.commentText
+          this.formTongGuo.commentText = mesg.commentText
         })
       }else {
         this.form.XCSJBUSS = this.dateFormatter()
@@ -1733,19 +1731,19 @@ export default {
     popoverHideCancel(){
       this.modalShowFlag1  = false
     },
-    // popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
+    popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) {
-    //   if(checkedData && checkedData.length != 0) {
+      if(checkedData && checkedData.length != 0) {
-    //     if(checkedData.length > 0 && checkedData.length != 0){
+        if(checkedData.length > 0 && checkedData.length != 0){
-    //       this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
+          this.form.cycvppsbm = checkedData.map(item => item.code).join(",")
-    //       this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
+          this.form.cycvppscn = checkedData.map(item => item.chineseName).join(",")
-    //     }else {
+        }else {
-    //       this.form.cycvppsbm = checkedData.code
+          this.form.cycvppsbm = checkedData.code
-    //       this.form.cycvppscn = checkedData.chineseName
+          this.form.cycvppscn = checkedData.chineseName
-    //     }
+        }
-    //     this.modalShowFlag2 = false
+        this.modalShowFlag2 = false
-    //   }
+      }
-    //
+
-    // },
+    },
     popoverHideBusVsCancel(){
       this.modalShowFlag2 = false
     },
@@ -2013,8 +2011,21 @@ export default {
         this.form.prcNum = this.prcNum
         this.form.prcName = this.prcName
         this.form['id'] = item.id
+        this.form['SYCXCLASS'] = this.filterObj(this.form['SYCXCLASS'])
+        this.form['NYLXCLASS'] = this.filterObj(this.form['NYLXCLASS'])
+        this.form['SYCPXCLASS'] = this.filterObj(this.form['SYCPXCLASS'])
       })
     },
+    filterObj(obj){
+      if(obj && obj !== ''){
+        if(obj instanceof Array){
+          return obj;
+        }else {
+          return obj.split(",")
+        }
+      }
+      return "";
+    },
     assemble(ids,names){
       let list= new Array();
       if(ids && ids !== '' && names && names !== ''){
@@ -2142,6 +2153,10 @@ export default {
       this.gkglbmOptions=res.data.GKGLBM;//归口管理部门
       this.setMap(this.standStateOptions)
     })
+    this.tablePHeight = $('.content').height()
+    window.onresize = () => {
+      this.tablePHeight = $('.content').height()
+    }
     this.busVsFunc()
     this.modelFunc()
   }