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

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

@@ -477,6 +477,7 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
+                      console.log(data);
                         let commitStatus = res.commitStatus
                         if(commitStatus && commitStatus > 0){
                             this.acceptShow = true

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

@@ -384,14 +384,15 @@
                         pId: this.pId
                     }).then(res => {
                         let data = JSON.parse(res.mesg)
-                        this.form.dyhz = data.form ? data.form.dyhz : data.dyhz
+                        console.log(data);
+                        this.form.dyhz = data.dyhz || data.form.dyhz
                         this.form.title = data.title || data.form.title
                         this.form.processName = data.processName || data.form.processName
                         this.form.date = data.date || data.form.date
                         this.json = data || data.form
-                        this.form.file = data.form ? data.form.fileId : data.fileId
+                        this.form.file =  data.fileId || data.form.fileId
-                        this.form.fileName = data.form ? data.form.fileName : data.fileName
+                        this.form.fileName = data.fileName || data.form.fileName
-                        this.form.fileId = data.form ? data.form.fileId : data.fileId
+                        this.form.fileId = data.fileId || data.form.fileId
                         this.form.modelList = data.form ? data.form.modelList : data.modelList
                         this.form.fjList = data.fjList || data.form.fjList
                         this.newDocUser = data.form ? data.form.docUser : data.docUser

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

@@ -404,7 +404,7 @@
                 :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
             <div class="demo-drawer-content">
                 <div style="display: flex; height: 100%;">
-                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
+                    <div style="width: 50%; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
                         <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
                             <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
                             <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
@@ -418,7 +418,7 @@
                             </div>
                         </div>
                     </div>
-                    <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
+                    <div style="width: 50%; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
                         <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
                         <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
                     </div>
@@ -1187,7 +1187,7 @@
 
       .itemsTextBox {
         min-height: 300px;
-        max-height: 500px;
+        max-height: 900px;
         overflow: auto;
         line-height: 20px;
         /deep/ td {

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

@@ -411,7 +411,7 @@
             :size="PLmodalType === 1 && form.itemsNum1 ? '1200px' : '800px'">
       <div class="demo-drawer-content">
         <div style="display: flex; height: 100%;">
-          <div style="width: 600px; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
+          <div style="width: 50%; border-right: 1px solid #ccc;" v-if="form.itemsNum1 && PLmodalType === 1 ">
             <div v-if="BDtext" style="width: 100%; height: 100%;display: flex;">
               <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
               <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
@@ -425,7 +425,7 @@
               </div>
             </div>
           </div>
-          <div style="width: 600px; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
+          <div style="width: 50%; border-right: 1px solid #ccc;" v-if="!form.itemsNum1 && PLmodalType === 1 ">
             <div v-if="itermsConditions" v-html="itermsConditions" class="itemsTextBox" style="margin: 5px; padding: 5px; width: 100%; overflow: auto;"></div>
             <div v-else style="margin: 5px; padding: 5px; width: 100%; overflow: auto;">无内容</div>
           </div>
@@ -1197,7 +1197,7 @@ export default {
 
   .itemsTextBox {
     min-height: 300px;
-    max-height: 500px;
+    max-height: 900px;
     overflow: auto;
     line-height: 20px;
     /deep/ td {

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

@@ -86,6 +86,20 @@
                     <el-radio label="2">否</el-radio>
                   </el-radio-group>
                 </el-form-item>
+                <el-form-item  label="归档位置" class="add-form-item form-item-disabled">
+                  <el-input
+                    style="display: none"
+                    v-model="form.treeListId"
+                  ></el-input>
+                  <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
+                    <el-input
+                      v-model="form.treeListName"
+                      clearable
+                      placeholder="选择归档位置"
+                      readonly>
+                    </el-input>
+                  </el-tooltip>
+                </el-form-item>
               </el-col>
               <el-col :span="12">
                 <el-form-item label="标准编号" prop="standNumber" class="add-form-item form-item-disabled">
@@ -143,20 +157,6 @@
                       clearable
                   ></el-input>
                 </el-form-item>
-                <el-form-item  label="归档位置" class="add-form-item form-item-disabled">
-                  <el-input
-                    style="display: none"
-                    v-model="form.treeListId"
-                  ></el-input>
-                  <el-tooltip effect="dark" :content=form.treeListName placement="top-start">
-                    <el-input
-                      v-model="form.treeListName"
-                      clearable
-                      placeholder="选择归档位置"
-                      readonly>
-                    </el-input>
-                  </el-tooltip>
-                </el-form-item>
               </el-col>
               <el-col :span="24">
                 <el-form-item label="标准英文名称" prop="standEnName" class="add-form-item form-item-disabled">
@@ -499,6 +499,17 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item v-show="form.standInData === '0'" label="我司参与制标排名" prop="cyzbpm" class="add-form-item form-item-disabled">
+                  <el-select :popper-append-to-body="false" v-model="form.cyzbpm" placeholder="请选择我司参与制标排名" clearable>
+                    <el-option
+                      v-for="item in cyzbpmOptions"
+                      placeholder="请选择"
+                      :key="item.value"
+                      :value="item.value"
+                      :label="item.label"
+                    ></el-option>
+                  </el-select>
+                </el-form-item>
               </el-col>
             </el-row>
           </div>
@@ -939,6 +950,7 @@ export default {
       categoryOptions: [], // 能源类型
       applyAuthOptions: [], // 适用认证
       cysdOptions: [], // 我司参与深度
+      cyzbpmOptions: [], //我司参与制标排名
       wssmrOptions: [], // 我司署名人
       qcdwOptions: [], // 起草单位
       sycpxOptions: [], // 适用产品线
@@ -1272,6 +1284,7 @@ export default {
       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 // 适用产品线

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

@@ -31,7 +31,7 @@
                     <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-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"
@@ -53,7 +53,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="标准年份" prop="standYear" class="add-form-item form-item-disabled">
+                <el-form-item label="标准年份" v-if="form.standInData === '0'" prop="standYear" class="add-form-item form-item-disabled">
                   <el-input
                     v-model="form.standYear"
                     placeholder="请输入标准标准年份"

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

@@ -2457,8 +2457,6 @@
                                     this.form.approvalOpinion = this.formTongGuo.approvalOpinion
                                     this.form.topId = this.pId
                                     const json = JSON.stringify(this.form);
-                                    this.processCreateBuss(json)
-                                return
                                     this.$http.post('lawss/activiti/completeTask', {
                                         taskIds: this.taskIds,
                                         userId : this.userId,