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

src/pages/processCenter/pages/components/ProcessFooter.vue

@@ -1,6 +1,6 @@
                                               <!-- ProcessFooter -->
 <template>
-  <div class="process-footer" v-if="showSave || showSubmit">
+  <div class="process-footer" v-if="showSave || showSubmit || showSubmit2">
     <div class="footer-line"></div>
     <div class="btn-group-wrap">
       <slot></slot>
@@ -47,6 +47,24 @@
               :loading="transferLoading"
               v-if="showTransfer"
       >转办</el-button>
+      <el-button
+              type="primary"
+              size="small"
+              class="common-button-primary"
+              icon="el-icon-check"
+              @click="handleSubmit2"
+              :loading="submitLoading"
+              v-if="showSubmit2"
+      >通过</el-button>
+      <el-button
+              type="danger"
+              size="small"
+              class="common-button-danger"
+              icon="el-icon-close"
+              @click="handleOver2"
+              :loading="submitLoading"
+              v-if="showOver2"
+      >驳回</el-button>
       <el-button
         type="primary"
         size="mini"
@@ -129,6 +147,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showOver2: {
+      type: Boolean,
+      default: false
+    },
     // 是否显示保存按钮
     showSave: {
       type: Boolean,
@@ -149,6 +171,10 @@ export default {
       type: Boolean,
       default: false
     },
+    showSubmit2: {
+      type: Boolean,
+      default: false
+    },
     showTransfer:{
       type: Boolean,
       default: false
@@ -237,9 +263,15 @@ export default {
     handleOver() {
       this.$emit('over')
     },
+    handleOver2() {
+      this.$emit('over2')
+    },
     handleSave() {
       this.$emit('save')
     },
+    handleSubmit2() {
+      this.$emit('submit2')
+    },
     handleSubmit() {
       this.$emit('submit')
     },

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

@@ -165,6 +165,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
+                        v-if="!form.itemsNum1"
                         prop="technicalRequir"
                         width="150"
                         label="核心技术要求"
@@ -178,6 +179,7 @@
                 <el-table-column
                         prop="changePoint"
                         width="150"
+                        v-if="form.itemsNum1"
                         label="基于上一版本差异"
                         align="center">
                     <template slot-scope="scope">
@@ -187,7 +189,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column
-                        v-if="sarType === 'FOREIGN'"
+                        v-if="sarType === 'FOREIGN' && form.itemsNum1"
                         prop="changePoint"
                         width="150"
                         label="相对于国行标差异点"
@@ -363,21 +365,21 @@
                 size="800px">
             <div class="demo-drawer-content">
                 <el-form :model="plForm" class="label-input-form" ref="plForm" label-width="150">
-                    <el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item" >
+                    <el-formItem label="核心技术要求" prop="technicalRequir" class="add-form-item"  v-if="!form.itemsNum1">
                         <el-input
                                 v-model="plForm.technicalRequir"
                                 placeholder="请输入核心技术要求"
                                 maxlength="500"
                         ></el-input>
                     </el-formItem>
-                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND'">
+                    <el-form-item label="国内标准的差异点" prop="changePoint" class="add-form-item" v-if="sarType !== 'INLAND' && form.itemsNum1">
                         <el-input
                                 v-model="plForm.changePoint"
                                 placeholder="请输入国内标准的差异点"
                                 maxlength="500"
                         ></el-input>
                     </el-form-item>
-                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND'">
+                    <el-form-item label="上一版本差异点" prop="changePoint" class="add-form-item" v-if="sarType === 'INLAND' && form.itemsNum1">
                         <el-input
                                 v-model="plForm.changePoint"
                                 placeholder="请输入上一版本差异点"
@@ -636,7 +638,7 @@
                                 num6++
                             }
                         }
-                        if (this.form.itemsNum1) {
+                        if (!this.form.itemsNum1) {
                             if (num1 > 0) {
                                 this.$message.warning('请输入核心技术要求')
                                 return

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

@@ -516,14 +516,14 @@
                                     ref="formTongGuo"
                                     :model="formTongGuo"
                                     :rules="rules">
-                    <el-form-item
+                                <!--                    <el-form-item-->
-                        prop="approvalOpinion"
+                                <!--                        prop="approvalOpinion"-->
-                    >
+                                <!--                    >-->
-                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">
+                                <!--                      <el-select @change="getRule" v-model="formTongGuo.approvalOpinion" placeholder="请审批" style="margin-bottom: 20px;">-->
-                        <el-option label="驳回" value="1"></el-option>
+                                <!--                        <el-option label="驳回" value="1"></el-option>-->
-                        <el-option label="通过" value="0"></el-option>
+                                <!--                        <el-option label="通过" value="0"></el-option>-->
-                      </el-select>
+                                <!--                      </el-select>-->
-                    </el-form-item>
+                                <!--                    </el-form-item>-->
                                 <el-form-item
                                         prop="commentText"
                                 >
@@ -659,13 +659,14 @@
         <!--      提交-->
         <ProcessFooter
                 :show-save="false"
-                show-submit
+                show-over2
+                show-submit2
                 show-transfer
                 :submitLoading="isSubmit"
                 :saveLoading="saveLoading"
                 @transfer="handleTransfer"
-                @save="handleSave"
+                @submit2="handle2"
-                @submit="handleSubmit"
+                @over2="handle1"
         >
         </ProcessFooter>
 
@@ -1049,6 +1050,14 @@
                 this.drawerTitle = '转办处理人'
             },
             handleSave() {},
+            handle1(){
+                this.formTongGuo.approvalOpinion = 1
+                this.handleSubmit()
+            },
+            handle2(){
+                this.formTongGuo.approvalOpinion = 0
+                this.handleSubmit()
+            },
             handleSubmit() {
                 const val= this.form.country;
                 if (val !== '' && val !== null && typeof (val) !== 'undefined') {

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

@@ -67,7 +67,7 @@
           <el-button type="primary"
                      class="common-button-primary add-button"
                      @click="upload(oldData, '征求意见搞.xls')"
-                     size="mini">导出征求意见搞
+                     size="mini">导出征求意见稿
           </el-button>
         </div>
         <el-table