Merge branch 'develop' into FOTON

src/pages/details/otherStandardDetails/index.vue

@@ -1335,7 +1335,7 @@
         <div class="see-drawer-div">
           <label class="see-drawer-name" style="font-size: 14px" title="适用车型">适用车型</label>
           <span class="see-drawer-val" style="font-size: 12px" :title="standShowItemEO.applyArctic">{{
-              standShowItemEO.applyArctic
+              filterApplyArctic(standShowItemEO)
             }}</span>
         </div>
         <div class="see-drawer-div">
@@ -2100,7 +2100,6 @@ export default {
   watch: {},
   methods: {
     filterApplyArctic(row){
-      console.log(row)
       if(row.applyArctic){
         return row.applyArctic.replaceAll('\"', '').replaceAll('\[', '').replaceAll('\]', '')
       }else {

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

@@ -244,7 +244,12 @@
         },
         methods: {
             clickButtonToUpload(file) {
-                const attId = file.attId
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

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

@@ -305,11 +305,21 @@
         },
         methods: {
             clickButtonToUpload2(file) {
-                const attId = file
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             clickButtonToUpload(file) {
-                const attId = file.attId
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

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

@@ -280,11 +280,21 @@
         },
         methods: {
             clickButtonToUpload2(file) {
-                const attId = file
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             clickButtonToUpload(file) {
-                const attId = file.attId
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

src/pages/processCenter/pages/creatProcess/bzdy/step5.vue

@@ -287,7 +287,12 @@
         },
         methods: {
             clickButtonToUpload2(file) {
-                const attId = file
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

src/pages/processCenter/pages/creatProcess/bzdy/step6.vue

@@ -282,7 +282,12 @@
         },
         methods: {
             clickButtonToUpload2(file) {
-                const attId = file
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

src/pages/processCenter/pages/creatProcess/bzdy/step7.vue

@@ -281,7 +281,12 @@
         },
         methods: {
             clickButtonToUpload2(file) {
-                const attId = file
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

src/pages/processCenter/pages/creatProcess/bzdy/step8.vue

@@ -282,7 +282,12 @@
         },
         methods: {
             clickButtonToUpload2(file) {
-                const attId = file
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

src/pages/processCenter/pages/creatProcess/bzdy/step9.vue

@@ -316,11 +316,21 @@
         },
         methods: {
             clickButtonToUpload2(file) {
-                const attId = file
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             clickButtonToUpload(file) {
-                const attId = file.attId
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

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

@@ -41,16 +41,22 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                <el-form-item v-if="verifySarStandard" label="标准年份" prop="" class="add-form-item form-item-disabled">
                   <el-input :disabled="disabledXX"
-                    v-model.trim="form.standNumber"
+                            v-model="form.standYear"
-                    placeholder="请输入标准编号"
+                            placeholder="请输入标准标准年份"
-                    clearable
+                            clearable
                   ></el-input>
                 </el-form-item>
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
-                    <el-input :disabled="disabledXX"  v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                    <el-input
+                    :disabled="disabledXX"
+                    v-model="form.standSystem"
+                    type="textarea"
+                    autosize
+                    clearable placeholder="选择标准体系"
+                    @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
                   </el-tooltip>
                   <tree-select-new v-if="!disabledXX"
                     :key="key"
@@ -65,31 +71,39 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item v-show="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
+
-                  <el-select :disabled="disabledXX"  :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="signFlag" class="add-form-item form-item-disabled">
                   <el-radio-group v-model="form.signFlag">
                     <el-radio :disabled="disabledXX" label="1">是</el-radio>
                     <el-radio :disabled="disabledXX" label="2">否</el-radio>
                   </el-radio-group>
                 </el-form-item>
+                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
+                  <el-input :disabled="disabledXX"
+                            v-model.trim="form.standNumber"
+                            placeholder="请输入标准编号"
+                            clearable
+                  ></el-input>
+                </el-form-item>
+                <el-form-item v-show="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
+                  <el-select :disabled="disabledXX"  :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="standNature" class="add-form-item form-item-disabled" v-show="form.standInData === '0'">
                   <el-select :disabled="disabledXX"  :popper-append-to-body="false" v-model="form.standNature" placeholder="请选择标准性质">
                     <el-option
-                      v-for="item in standNatureOptions"
+                            v-for="item in standNatureOptions"
-                      placeholder="请选择"
+                            placeholder="请选择"
-                      :key="item.value"
+                            :key="item.value"
-                      :value="item.value"
+                            :value="item.value"
-                      :label="item.label"
+                            :label="item.label"
                     ></el-option>
                   </el-select>
                 </el-form-item>
@@ -109,13 +123,6 @@
                   <el-button :disabled="disabledXX"  @click="form.isRelateAccess = ''" v-show="form.isRelateAccess !== null>0" size="mini" type="primary" circle icon="el-icon-close" style="margin-left: 10px;margin-bottom: 3px"></el-button>
                 </el-form-item>
                 <!--v-if="verifySarStandard && form.standInData === '0' " -->
-                <el-form-item v-if="verifySarStandard" label="标准年份" prop="" class="add-form-item form-item-disabled">
-                  <el-input :disabled="disabledXX"
-                    v-model="form.standYear"
-                    placeholder="请输入标准标准年份"
-                    clearable
-                  ></el-input>
-                </el-form-item>
               </el-col>
             </el-row>
             <el-row :gutter="24">

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

@@ -30,17 +30,6 @@
                      <el-radio label="1">国外标准入库</el-radio>
                    </el-radio-group>
                  </el-form-item>
-                 <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                   <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
-                     <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="standSort" class="add-form-item form-item-disabled">
                    <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
                      <el-option
@@ -71,14 +60,6 @@
                  </el-form-item>
                </el-col>
               <el-col :span="12">
-                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.standNumber"
-                    placeholder="请输入标准编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
                     <el-option
@@ -90,6 +71,25 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
+                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
+                    <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
+                          disabled
+                          v-model="form.standNumber"
+                          placeholder="请输入标准编号"
+                          clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
                   <el-select v-model="form.textStatus" placeholder="请选择文本状态" disabled>
                     <el-option
@@ -172,7 +172,7 @@
               <el-col :span="12">
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
-                    <el-input v-model="form.standSystem" disabled></el-input>
+                    <el-input v-model="form.standSystem" type="textarea" autosize  disabled></el-input>
                   </el-tooltip>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
@@ -824,6 +824,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="ccc">加载数据</loading>
   </div>
 </template>
 
@@ -840,6 +841,7 @@ export default {
   name: "bzrkStep2",
   data() {
     return {
+      ccc:false,
       xgdFileMap: [],
       fbgbjbdFileMap: [],
       fbgywbdFileMap: [],
@@ -1162,6 +1164,7 @@ export default {
       return list;
     },
     getData() {
+      this.ccc = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
@@ -1376,35 +1379,48 @@ export default {
         }
       })
     },
+    getDicTypeListCode(res,json) {
+      return new Promise((resolve, reject) => {
+        this.$http.get('sys/dictype/getDicTypeListCode', '', {
+          _this: this
+        }, res => {
+          const history = res;
+          resolve(history)
+        })
+      })
+    },
+    async getDataAsync(){
+      let res = await this.getDicTypeListCode()
+      if(res && res.data){
+        this.countryOptions = res.data.COUNTRY//国家地区
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+        this.standStateOptions = res.data.WBZTCLASS // 文本状态
+        this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+        this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+        this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+        this.cysdOptions = res.data.WSCYSD // 我司参与深度
+        this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
+        this.wssmrOptions = res.data.WSSMR // 我司署名人
+        this.qcdwOptions = res.data.QCDW // 起草单位
+        this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+        this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+        this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+        this.txlbOptions = res.data.TXLBCLASS // 体系类别
+        this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+        this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+        this.key++
+        this.ccc = false
+      }
+    },
   },
   created() {
   },
   mounted() {
     this.getData()
+    this.getDataAsync()
     this.processTable()
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.countryOptions = res.data.COUNTRY//国家地区
-      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-      this.standStateOptions = res.data.WBZTCLASS // 文本状态
-      this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-      this.cysdOptions = res.data.WSCYSD // 我司参与深度
-      this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
-      this.wssmrOptions = res.data.WSSMR // 我司署名人
-      this.qcdwOptions = res.data.QCDW // 起草单位
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-      this.txlbOptions = res.data.TXLBCLASS // 体系类别
-      this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
-      this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
-      this.key++
-    })
     this.busVsFunc()
     this.modelFunc()
   }

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

@@ -30,17 +30,6 @@
                     <el-radio label="1">海外标准入库</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
-                    <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  v-show="form.standInData === '0'" label="标准类别" prop="standSort" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
                     <el-option
@@ -70,14 +59,6 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    disabled
-                    v-model="form.standNumber"
-                    placeholder="请输入标准编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item  v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standNature" placeholder="请选择标准性质" disabled>
                     <el-option
@@ -89,6 +70,25 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
+                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
+                    <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
+                          disabled
+                          v-model="form.standNumber"
+                          placeholder="请输入标准编号"
+                          clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
                   <el-select v-model="form.textStatus" placeholder="请选择文本状态" disabled>
                     <el-option
@@ -108,7 +108,7 @@
                 </el-form-item>
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
-                    <el-input v-model="form.standSystem" disabled></el-input>
+                    <el-input v-model="form.standSystem" type="textarea" autosize disabled></el-input>
                   </el-tooltip>
                 </el-form-item>
               </el-col>
@@ -808,6 +808,7 @@
             @checkedRole="checkedRole"
             :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="ccc">加载数据</loading>
   </div>
 </template>
 
@@ -825,6 +826,7 @@ export default {
   name: "bzrkStep3",
   data () {
     return {
+      ccc: false,
       submitType: '',
       xgdFileMap: [],
       fbgbjbdFileMap: [],
@@ -1123,6 +1125,7 @@ export default {
         return list;
     },
     getData() {
+      this.ccc = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
@@ -1301,36 +1304,49 @@ export default {
         }
       })
     },
+    getDicTypeListCode(res,json) {
+      return new Promise((resolve, reject) => {
+        this.$http.get('sys/dictype/getDicTypeListCode', '', {
+          _this: this
+        }, res => {
+          const history = res;
+          resolve(history)
+        })
+      })
+    },
+    async getDataAsync(){
+      let res = await this.getDicTypeListCode()
+      if(res && res.data){
+        this.countryOptions=res.data.COUNTRY//国家地区
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+        this.standStateOptions = res.data.WBZTCLASS // 文本状态
+        this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+        this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+        this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+        this.cysdOptions = res.data.WSCYSD // 我司参与深度
+        this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
+        this.wssmrOptions = res.data.WSSMR // 我司署名人
+        this.qcdwOptions = res.data.QCDW // 起草单位
+        this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+        this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+        this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+        this.txlbOptions = res.data.TXLBCLASS // 体系类别
+        this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+        this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+        this.key++
+        this.ccc = false
+      }
+    },
   },
   created(){
     this.getData()
   },
   mounted () {
     this.getData()
+    this.getDataAsync()
     this.processTable()
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.countryOptions=res.data.COUNTRY//国家地区
-      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-      this.standStateOptions = res.data.WBZTCLASS // 文本状态
-      this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-      this.cysdOptions = res.data.WSCYSD // 我司参与深度
-      this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
-      this.wssmrOptions = res.data.WSSMR // 我司署名人
-      this.qcdwOptions = res.data.QCDW // 起草单位
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-      this.txlbOptions = res.data.TXLBCLASS // 体系类别
-      this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
-      this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
-      this.key++
-    })
     this.busVsFunc()
     this.modelFunc()
   },

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

@@ -31,17 +31,6 @@
                     <el-radio label="1">海外标准入库</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple>
-                    <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="standSort" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standSort" filterable placeholder="请选择标准类别">
                     <el-option
@@ -62,7 +51,7 @@
                 </el-form-item>
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
-                    <el-input v-model="form.standSystem" clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
+                    <el-input v-model="form.standSystem" type="textarea" autosize clearable placeholder="选择标准体系" @click.native="choiceZRR1('standSystem', '标准体系', form.standSystem)"></el-input>
                   </el-tooltip>
                   <tree-select-new
                     :key="key"
@@ -77,13 +66,6 @@
                 </el-form-item>
               </el-col>
               <el-col :span="12">
-                <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
-                  <el-input
-                    v-model="form.standNumber"
-                    placeholder="请输入标准编号"
-                    clearable
-                  ></el-input>
-                </el-form-item>
                 <el-form-item v-show="form.standInData === '0'" label="标准性质" prop="standNature" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standNature" placeholder="请选择标准性质">
                     <el-option
@@ -95,6 +77,24 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
+                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple>
+                    <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"
+                          placeholder="请输入标准编号"
+                          clearable
+                  ></el-input>
+                </el-form-item>
                 <el-form-item label="文本状态" prop="textStatus" class="add-form-item form-item-disabled">
                   <el-select v-model="form.textStatus" placeholder="请选择文本状态">
                     <el-option

src/pages/processCenter/pages/creatProcess/bzrk/step5.vue

@@ -30,17 +30,6 @@
                     <el-radio label="1">国外标准入库</el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
-                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
-                    <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="standSort" class="add-form-item form-item-disabled">
                   <el-select v-model="form.standSort" placeholder="请选择标准类别" disabled>
                     <el-option
@@ -60,6 +49,17 @@
                     clearable
                   ></el-input>
                 </el-form-item>
+                <el-form-item v-if="form.standInData === '1'" label="国家/地区" prop="country" class="add-form-item form-item-disabled">
+                  <el-select :popper-append-to-body="false" v-model="form.country" placeholder="国家/地区" multiple disabled>
+                    <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="issueTime" class="add-form-item form-item-disabled">
                   <el-date-picker
                     disabled
@@ -172,7 +172,7 @@
               <el-col :span="12">
                 <el-form-item label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
                   <el-tooltip :disabled="!form.standSystem" effect="dark" :content=form.standSystem placement="top-start">
-                    <el-input v-model="form.standSystem" disabled></el-input>
+                    <el-input v-model="form.standSystem" type="textarea" autosize disabled></el-input>
                   </el-tooltip>
                 </el-form-item>
                 <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
@@ -796,6 +796,7 @@
       @checkedRole="checkedRole"
       :nodeList="nodeList"
     ></Role-tree>
+    <loading :loading="ccc">加载数据</loading>
   </div>
 </template>
 
@@ -812,6 +813,7 @@ export default {
   name: "bzrkStep5",
   data() {
     return {
+      ccc: false,
       xgdFileMap: [],
       fbgbjbdFileMap: [],
       bpgFileMap: [],
@@ -1133,6 +1135,7 @@ export default {
       return list;
     },
     getData() {
+      this.ccc = true
       return new Promise((resolve, reject) => {
         inboundLiaisonDetail({
           taskIds: this.taskIds,
@@ -1356,35 +1359,48 @@ export default {
         }
       })
     },
+    getDicTypeListCode(res,json) {
+      return new Promise((resolve, reject) => {
+        this.$http.get('sys/dictype/getDicTypeListCode', '', {
+          _this: this
+        }, res => {
+          const history = res;
+          resolve(history)
+        })
+      })
+    },
+    async getDataAsync(){
+      let res = await this.getDicTypeListCode()
+      if(res && res.data){
+        this.countryOptions = res.data.COUNTRY//国家地区
+        this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
+        this.standNatureOptions = res.data.SARPROPERTY // 标准性质
+        this.standStateOptions = res.data.WBZTCLASS // 文本状态
+        this.standSystemOptions = res.data.BZTXCLASS // 标准体系
+        this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
+        this.categoryOptions = res.data.NYLXCLASS // 能源类型
+        this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
+        this.cysdOptions = res.data.WSCYSD // 我司参与深度
+        this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
+        this.wssmrOptions = res.data.WSSMR // 我司署名人
+        this.qcdwOptions = res.data.QCDW // 起草单位
+        this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
+        this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
+        this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
+        this.txlbOptions = res.data.TXLBCLASS // 体系类别
+        this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
+        this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
+        this.key++
+        this.ccc = false
+      }
+    },
   },
   created() {
   },
   mounted() {
     this.getData()
+    this.getDataAsync()
     this.processTable()
-    this.$http.get('sys/dictype/getDicTypeListCode', '', {
-      _this: this
-    }, res => {
-      this.countryOptions = res.data.COUNTRY//国家地区
-      this.standSortOptions = res.data.STANDCLASSIFY // 标准类别
-      this.standNatureOptions = res.data.SARPROPERTY // 标准性质
-      this.standStateOptions = res.data.WBZTCLASS // 文本状态
-      this.standSystemOptions = res.data.BZTXCLASS // 标准体系
-      this.applyArcticOptions = res.data.ENERGYTYPES // 适用车型
-      this.categoryOptions = res.data.NYLXCLASS // 能源类型
-      this.applyAuthOptions = res.data.SYRZCLASS // 适用认证
-      this.cysdOptions = res.data.WSCYSD // 我司参与深度
-      this.cyzbpmOptions = res.data.CYZBPM // 我司参与制标排名
-      this.wssmrOptions = res.data.WSSMR // 我司署名人
-      this.qcdwOptions = res.data.QCDW // 起草单位
-      this.sycpxOptions = res.data.SYCPXCLASS // 适用产品线
-      this.zrbmOptions = res.data.ZRBMCLASS // 责任部门
-      this.zrgcsOptions = res.data.ZRGCSCLASS // 责任工程师
-      this.txlbOptions = res.data.TXLBCLASS // 体系类别
-      this.gkglbmOptions = res.data.GKGLBM // 归口管理部门
-      this.cbcdOptions = res.data.DEGREESTANDARD // 采标程度
-      this.key++
-    })
     this.busVsFunc()
     this.modelFunc()
   }

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

@@ -175,6 +175,9 @@
 <style lang="less" scoped>
     @import '~@/assets/styles/mixins';
     @import '~@/assets/styles/style';
+    /deep/ .container{
+        overflow: auto;
+    }
     .ZQYJAddFileDetails {
         height: 100%;
         display: flex;

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

@@ -43,37 +43,7 @@
                           placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
-                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
+                <el-form-item label="相关文件" prop="modelNameList" class="add-form-item form-item-disabled">
-                  <el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
-                    <el-option
-                            v-for="(item, index) in textTypeList"
-                            :key="index"
-                            :label="item.label"
-                            :value="item.value">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
-                  <div class="addButton" style="padding-left: 10px">
-                    <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择附件</el-button>
-                  </div>
-                  <el-input
-                          v-model="form.fjListId"
-                          style="display: none;"
-                  ></el-input>
-                  <div style="">
-                    <div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
-                      <span @click="fileLook(item)" >{{ item.fileName }}</span>
-                      <el-button
-                              size="small"
-                              @click="filesUpload(item)"
-                              icon="el-icon-download"
-                              style="height: 32px; margin-left: 5px;"
-                      ></el-button>
-                    </div>
-                  </div>
-                </el-form-item>
-                <el-form-item label="上传附件" prop="modelNameList" class="add-form-item form-item-disabled">
                   <el-input
                           disabled
                           style="display: none;"
@@ -101,6 +71,36 @@
                     </el-button>
                   </div>
                 </el-form-item>
+                <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
+                  <el-select :disabled="!form.cid" v-model="form.textType" placeholder="请选择">
+                    <el-option
+                            v-for="(item, index) in textTypeList"
+                            :key="index"
+                            :label="item.label"
+                            :value="item.value">
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                <el-form-item label="标准文本" prop="fjListId" class="add-form-item form-item-disabled">
+                  <div class="addButton" style="padding-left: 10px">
+                    <el-button size="small" type="primary" :disabled="!form.cid" @click="addfjList">选择文本</el-button>
+                  </div>
+                  <el-input
+                          v-model="form.fjListId"
+                          style="display: none;"
+                  ></el-input>
+                  <div style="">
+                    <div class="fileClass" style="margin-right: 15px;padding-left: 10px" v-for="(item, index) in form.fjList" :key="index">
+                      <span @click="fileLook(item)" >{{ item.fileName }}</span>
+                      <el-button
+                              size="small"
+                              @click="filesUpload(item)"
+                              icon="el-icon-download"
+                              style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -347,7 +347,7 @@
         </div>
       </div>
     </el-drawer>
-    <el-dialog width='400px' :visible.sync="fileMadel" title="上传附件">
+    <el-dialog width='400px' :visible.sync="fileMadel" title="相关文件">
       <el-upload
               multiple
               class="upload-demo"

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

@@ -42,6 +42,34 @@
                     placeholder="请选择结束日期">
                   </el-date-picker>
                 </el-form-item>
+                <el-form-item label="相关文件" prop="modelNameList" class="add-form-item form-item-disabled">
+                  <el-input :disabled="disabledXX"
+                            disabled
+                            style="display: none;"
+                            v-model="form.modelNameList"
+                            clearable
+                  ></el-input>
+                  <div v-if="form.modelList.length > 0" class="fileClass">
+                    <div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px; padding-left: 10px;">
+                      <span @click="fileLook(item)">{{ item.name }}</span>
+                      <el-button :disabled="disabledXX"
+                                 size="small"
+                                 @click="filesUpload(item)"
+                                 icon="el-icon-download"
+                                 style="height: 32px; margin-left: 5px;"
+                      ></el-button>
+                    </div>
+                  </div>
+                  <div class="addButton" style="padding-left: 10px">
+                    <el-button :disabled="disabledXX"
+                               type="primary"
+                               class="common-button-primary"
+                               @click="fileUpload"
+                               size="small">
+                      点击上传
+                    </el-button>
+                  </div>
+                </el-form-item>
                 <el-form-item label="文本状态" prop="textType" class="add-form-item form-item-disabled">
                   <el-select :disabled="!form.cid || disabledXX" v-model="form.textType" placeholder="请选择">
                     <el-option
@@ -52,9 +80,9 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="标准附件" prop="fjListId" class="add-form-item form-item-disabled">
+                <el-form-item label="标准文本" prop="fjListId" class="add-form-item form-item-disabled">
                   <div class="addButton" style="padding-left: 10px">
-                    <el-button size="small" type="primary" :disabled="!form.cid || disabledXX" @click="addfjList">选择附件</el-button>
+                    <el-button size="small" type="primary" :disabled="!form.cid || disabledXX" @click="addfjList">选择文本</el-button>
                   </div>
                   <el-input :disabled="disabledXX"
                     v-model="form.fjListId"
@@ -72,34 +100,6 @@
                     </div>
                   </div>
                 </el-form-item>
-                <el-form-item label="上传附件" prop="modelNameList" class="add-form-item form-item-disabled">
-                  <el-input :disabled="disabledXX"
-                          disabled
-                          style="display: none;"
-                          v-model="form.modelNameList"
-                          clearable
-                  ></el-input>
-                  <div v-if="form.modelList.length > 0" class="fileClass">
-                    <div v-for="(item, index) in form.modelList" :key="index" style="margin-right: 5px; padding-left: 10px;">
-                      <span @click="fileLook(item)">{{ item.name }}</span>
-                      <el-button :disabled="disabledXX"
-                              size="small"
-                              @click="filesUpload(item)"
-                              icon="el-icon-download"
-                              style="height: 32px; margin-left: 5px;"
-                      ></el-button>
-                    </div>
-                  </div>
-                  <div class="addButton" style="padding-left: 10px">
-                      <el-button :disabled="disabledXX"
-                              type="primary"
-                              class="common-button-primary"
-                              @click="fileUpload"
-                              size="small">
-                        点击上传
-                      </el-button>
-                  </div>
-                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -157,14 +157,14 @@
             <el-timeline-item timestamp="审核" placement="top" :color="roleForm.ministerUser ? '#66b1ff' : ''">
               <el-card>
                 <el-form-item prop="ministerUser" style="margin-bottom: 0">
-                  <h4>标准法规部高级经理、责任部门高级经理</h4>
+                  <h4>标准法规部高级经理</h4>
                   <div style="margin-top: 10px;width: 300px;">
                     <el-input :disabled="disabledXX"  v-model="roleForm.ministerUser" style="display: none;"/>
                     <el-input :disabled="disabledXX"
                       readonly
                       v-model="roleForm.ministerUserName"
-                      placeholder="选择标准法规部高级经理、责任部门高级经理"
+                      placeholder="选择标准法规部高级经理"
-                      @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理、责任部门高级经理', roleForm.ministerUser)"
+                      @click.native="choiceZRR('ministerUser', '选择标准法规部高级经理', roleForm.ministerUser)"
                     />
                   </div>
                 </el-form-item>
@@ -353,7 +353,7 @@
         </div>
       </div>
     </el-drawer>
-    <el-dialog width='400px' :visible.sync="fileMadel" title="上传附件">
+    <el-dialog width='400px' :visible.sync="fileMadel" title="相关文件">
       <el-upload
               multiple
               class="upload-demo"

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

@@ -232,122 +232,127 @@
       size="900px"
       custom-class="demo-drawer"
     >
-      <div class="demo-drawer-content">
+      <div class="standard-content">
-        <div style="position: absolute;bottom: 48px;top:60px;left: 0;right: 0">
+        <div class="content">
-          <div style="position: absolute;bottom: 55px;top: 0;right: 0;left: 0">
+          <div class="standard-table-search">
-            <div class="left">
+            <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
-              <el-form :modal="projectSearch" :inline="true" class="label-input-form" style="margin-left:10px">
+              <el-form-item label="管理主体" class="search-item search-item-last">
-                <el-form-item label="管理主体" class="search-item search-item-last">
+                <el-select :disabled="disabledXX"  v-model="projectSearch.managementHostName"
-                  <el-select :disabled="disabledXX"  v-model="projectSearch.managementHostName"
+                           @change="optionsChange(projectSearch)"
-                             @change="optionsChange(projectSearch)"
+                           placeholder="请选择管理主体" filterable clearable>
-                             placeholder="请选择管理主体" filterable clearable>
+                  <el-option
-                    <el-option
+                          v-for="(item, index) in managementHostName"
-                      v-for="(item, index) in managementHostName"
+                          :key="index"
-                      :key="index"
+                          :value="item"
-                      :value="item"
+                          :label="item"
-                      :label="item"
+                  >
-                    >
+                  </el-option>
-                    </el-option>
+                </el-select>
-                  </el-select>
+              </el-form-item>
-                </el-form-item>
+              <el-form-item label="开发主体" class="search-item search-item-last">
-                <el-form-item label="开发主体" class="search-item search-item-last">
+                <el-select :disabled="disabledXX"  v-model="projectSearch.developmentHostName"  @change="optionsChange(projectSearch)" placeholder="请选择开发主体" filterable clearable>
-                  <el-select :disabled="disabledXX"  v-model="projectSearch.developmentHostName"  @change="optionsChange(projectSearch)" placeholder="请选择开发主体" filterable clearable>
+                  <el-option
-                    <el-option
+                          v-for="(item, index) in developmentHostName"
-                      v-for="(item, index) in developmentHostName"
+                          :key="index"
-                      :key="index"
+                          :value="item"
-                      :value="item"
+                          :label="item"
-                      :label="item"
+                  >
-                    >
+                  </el-option>
-                    </el-option>
+                </el-select>
-                  </el-select>
+              </el-form-item>
-                </el-form-item>
+              <el-form-item label="项目细分类" class="search-item search-item-last">
-                <el-form-item label="项目细分类" class="search-item search-item-last">
+                <el-select :disabled="disabledXX"  v-model="projectSearch.categoryName"  @change="optionsChange(projectSearch)" placeholder="请选择项目细分类" filterable clearable>
-                  <el-select :disabled="disabledXX"  v-model="projectSearch.categoryName"  @change="optionsChange(projectSearch)" placeholder="请选择项目细分类" filterable clearable>
+                  <el-option
-                    <el-option
+                          v-for="(item, index) in categoryName"
-                      v-for="(item, index) in categoryName"
+                          :key="index"
-                      :key="index"
+                          :value="item"
-                      :value="item"
+                          :label="item"
-                      :label="item"
+                  >
-                    >
+                  </el-option>
-                    </el-option>
+                </el-select>
-                  </el-select>
+              </el-form-item>
-                </el-form-item>
+              <el-form-item label="项目编号" class="search-item search-item-last">
-                <el-form-item label="项目编号" class="search-item search-item-last">
+                <el-input :disabled="disabledXX"
-                  <el-input :disabled="disabledXX"
+                          v-model="projectSearch.projectNumber"
-                    v-model="projectSearch.projectNumber"
+                          placeholder="请输入项目编号"
-                    placeholder="请输入项目编号"
+                ></el-input>
-                  ></el-input>
+              </el-form-item>
-                </el-form-item>
+              <el-form-item label="项目名称" class="search-item search-item-last">
-                <el-form-item label="项目名称" class="search-item search-item-last">
+                <el-input :disabled="disabledXX"
-                  <el-input :disabled="disabledXX"
+                          v-model="projectSearch.projectName"
-                    v-model="projectSearch.projectName"
+                          placeholder="请输入项目名称"
-                    placeholder="请输入项目名称"
+                ></el-input>
-                  ></el-input>
+              </el-form-item>
-                </el-form-item>
+              <el-form-item class="search-item btn-box">
-                <el-form-item class="search-item btn-box">
+                <el-button :disabled="disabledXX"
-                  <el-button :disabled="disabledXX"
+                           type="primary"
-                    type="primary"
+                           class="common-button-primary"
-                    class="common-button-primary"
+                           size="small"
-                    size="small"
+                           v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
-                    v-btn-permission="'072efe80c5459dd47fedd2d14f59ff7f'"
+                           @click="getProjectDataBtn">
-                    @click="getProjectDataBtn">
+                  查询
-                    查询
+                </el-button>
-                  </el-button>
+              </el-form-item>
-                </el-form-item>
+              <el-form-item class="search-item btn-box">
-                <el-form-item class="search-item btn-box">
+                <el-button :disabled="disabledXX"
-                  <el-button :disabled="disabledXX"
+                           class="common-button-default"
-                    class="common-button-default"
+                           size="small"
-                    size="small"
+                           v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
-                    v-btn-permission="'3480a13964a18e000196e4d5bc6ef117'"
+                           @click="clearSearch">清空
-                    @click="clearSearch">清空
+                </el-button>
-                  </el-button>
+              </el-form-item>
-                </el-form-item>
+            </el-form>
-              </el-form>
+          </div>
-            </div>
+          <div class="standard-table-wrap">
-            <el-table
+            <div style="height: calc(100% - 65px); ">
-              :data="ProjectDatas"
+              <div class="left">
-              tooltip-effect="dark"
+              </div>
-              style="width: 100%"
+              <el-table
-              border
+                      :data="ProjectDatas"
-              class="table-height"
+                      tooltip-effect="dark"
-              :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
+                      style="width: 100%"
+                      border
+                      class="table-height"
+                      :header-cell-style="{background: '#f5f1f1', color: '#333333', fontSize: '16px',
          fontWeight: 'bold', height: '48px'}"
-              @selection-change="selectProjectChange"
+                      @selection-change="selectProjectChange"
-              @select="handleSelectionChange"
+                      @select="handleSelectionChange"
-              ref="projectSelection"
+                      ref="projectSelection"
-            >
+              >
-              <el-table-column
+                <el-table-column
-                type="selection"
+                        type="selection"
-                width="55"
+                        width="55"
-                align="center" />
+                        align="center" />
-              <el-table-column
+                <el-table-column
-                prop="projectNumber"
+                        prop="projectNumber"
-                align="center"
+                        align="center"
-                label="项目编号"
+                        label="项目编号"
-              />
+                />
-              <el-table-column
+                <el-table-column
-                prop="projectName"
+                        prop="projectName"
-                align="center"
+                        align="center"
-                label="项目名称"
+                        label="项目名称"
-              />
+                />
-              <el-table-column
+                <el-table-column
-                prop="projectClassification"
+                        prop="projectClassification"
-                align="center"
+                        align="center"
-                label="项目分类"
+                        label="项目分类"
-              />
+                />
-              <el-table-column
+                <el-table-column
-                prop="uname"
+                        prop="uname"
-                align="center"
+                        align="center"
-                label="项目经理"
+                        label="项目经理"
-              />
+                />
-            </el-table>
+              </el-table>
+            </div>
+            <loading :loading="replaceLoading">{{$t('m.dataAcquisition')}}</loading>
           </div>
           <pagination
-            :page="page"
+                  :page="page"
-            :pageSize="pageSize"
+                  :pageSize="pageSize"
-            :total="total"
+                  :total="total"
-            @pageChange="pageChange"
+                  @pageChange="pageChange"
-            @pageSizeChange="pageSizeChange"
+                  @pageSizeChange="pageSizeChange"
           />
         </div>
       </div>
@@ -770,6 +775,7 @@ export default {
   },
   data() {
     return {
+      replaceLoading: false,
       disabledXX:!!this.$route.query.disabledXX,
       //折叠的标志，true为折叠，false为不折叠
       foldFormFlag: false,
@@ -1126,6 +1132,7 @@ export default {
     },
     //查询项目列表
     getProjectData() {
+      this.replaceLoading = true
       this.$http.get("sarStandProjectLibrary/queryProjectConfirm", {
         PageSize: this.pageSize,
         Page: this.page,
@@ -1135,8 +1142,9 @@ export default {
       }, res => {
         this.ProjectDatas = res.data.total.records;
         this.total = res.data.total.total;
+        this.replaceLoading = false
       }, e => {
-
+        this.replaceLoading = false
       });
     },
     //清空查询列表
@@ -1542,10 +1550,6 @@ export default {
       }
     }
   }
-  .table-height{
-    height: calc(~'100% - 65px');
-    overflow: auto;
-  }
   .drawer-table{
     /deep/.el-drawer__body{
       overflow-y: hidden;
@@ -1554,6 +1558,26 @@ export default {
       overflow-y: hidden;
     }
   }
+  .standard-content {
+    height: 92%;
+    padding: 10px 0 0;
+    .content {
+      height: 100%;
+      display: flex;
+      flex-direction: column;
+      padding: 0 10px;
+      .standard-table-wrap {
+        flex: auto;
+        overflow-y: auto;
+      }
+      .pagination {
+        position: static;
+        /deep/ .pagination-slot {
+          padding: 0;
+        }
+      }
+    }
+  }
 }
 </style>
 <style lang="less">

src/pages/processCenter/pages/phone/bzdy/step2.vue

@@ -154,7 +154,12 @@
         },
         methods: {
             clickButtonToUpload(file) {
-                const attId = file.attId
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

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

@@ -168,11 +168,21 @@
         },
         methods: {
             clickButtonToUpload2(file) {
-                const attId = file
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             clickButtonToUpload(file) {
-                const attId = file.attId
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

src/pages/processCenter/pages/phone/bzdy/step6.vue

@@ -188,7 +188,12 @@
         },
         methods: {
             clickButtonToUpload2(file) {
-                const attId = file
+                let attId = ""
+                if(file && file.id){
+                    attId = file.id
+                }else {
+                    attId = file.response.data.id
+                }
                 this.$preview(attId)
             },
             handleTransfer() {

src/pages/processCenter/pages/phone/bzrk/step2.vue

@@ -100,7 +100,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item  label="标准体系" prop="standSystem" class="add-form-item form-item-disabled">
-              <el-input v-model="form.standSystem" disabled></el-input>
+              <div class="wrap">{{form.standSystem}}</div>
             </el-form-item>
             <el-form-item v-if="form.standInData === '1'" label="标签" prop="gxhbq" class="add-form-item form-item-disabled">
               <el-input
@@ -158,7 +158,8 @@
                 - -
               </div>
             </el-form-item>
-            <el-form-item label="发布稿" prop="fbgbjbdName" class="add-form-item form-item-disabled">
+            <el-form-item prop="fbgbjbdName" class="add-form-item form-item-disabled">
+              <span slot="label" title="发布稿（原文）" style="width: 112px">发布稿（译文）</span>
               <div v-if="fbgbjbdFileMap.length>0" v-for="(value,index)  in this.fbgbjbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                 <span style="" @click="downloadFile('fbg',value.id)" :title="value.name">{{ value.name  }}</span>
               </div>
@@ -166,7 +167,8 @@
                 - -
               </div>
             </el-form-item>
-            <el-form-item label="发布稿（译文）" prop="fbgywbdName" class="add-form-item form-item-disabled">
+            <el-form-item prop="fbgywbdName" class="add-form-item form-item-disabled">
+              <span slot="label" title="发布稿（译文）" style="width: 112px">发布稿（译文）</span>
               <div v-if="fbgywbdFileMap.length>0" v-for="(value,index)  in this.fbgywbdFileMap" :key="index" style="cursor: pointer;color: #00b7ee">
                 <span style="" @click="downloadFileNew(value.id)" :title="value.name">{{ value.name  }}</span>
               </div>
@@ -678,6 +680,9 @@ export default {
         }
       })
     },
+    downloadFileNew(attId) {
+      this.$preview(attId)
+    },
     downloadFile(fileType,attId) {
       this.$preview(attId)
     },
@@ -995,6 +1000,12 @@ export default {
 @import '~@/assets/styles/phone';
 
 .bzrkStep2 {
+  /deep/ .el-form-item__label{
+    width: 112px !important;
+  }
+  /deep/ .el-form-item__content{
+    margin-left: 112px !important;
+  }
   /deep/.el-select .el-input .el-select__caret {
     font-size: 0;
   }