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

src/pages/loginVerify/index.vue

@@ -135,10 +135,12 @@
                 if (res.ok) {
                     this.loginNew(res)
                 } else {
-                  this.$message.warning('系统无权限访问')
+                    if(res.code && res.code === 'r0011'){
-                  this.$store.dispatch('logout')
+                        this.$message.warning('系统无权限访问')
-                    // window.location.href = 'http://sso.foton.com.cn/logout?service='
+                        this.$store.dispatch('logout')
-                   window.location.href = ssoLogoutUrlDev
+                        // window.location.href = 'http://sso.foton.com.cn/logout?service='
+                        window.location.href = ssoLogoutUrlDev
+                    }
                 }
             })
 

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue

@@ -80,14 +80,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
-              <el-input
-                readonly
-                v-model="qbfsForm.drafterName"
-                placeholder="请输入起草人"
-                clearable
-              ></el-input>
-            </el-form-item>
             <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
               <div v-if="qbfsForm.unitName">
                 <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
@@ -108,6 +100,14 @@
                 ></el-input>
               </div>
             </el-form-item>
+            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.drafterName"
+                placeholder="请输入起草人"
+                clearable
+              ></el-input>
+            </el-form-item>
             <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -157,13 +157,18 @@
                 placeholder="请输入采用标准"
                 :maxlength="500"/>
             </el-form-item>
-            <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
-              <el-input
+                          class="add-form-item form-item-disabled">
-                disabled
+              <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-                v-model="qbfsForm.useLevel"
+                <el-option
-                placeholder="请输入采标程度"
+                  v-for="(item, index) in cbcdOptions"
-                :maxlength="500"/>
+                  :key="index"
-            </el-form-item>            <el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="取消原因" prop="cancelReason" class="add-form-item form-item-disabled">
               <el-input
                 type="textarea"
                 v-model="qbfsForm.cancelReason"
@@ -339,6 +344,7 @@ export default {
       },
       ListModel: false,
       standinfoList: [],
+      cbcdOptions: [],
       BZList: [],
       standSortOptions: [],
       page: 1,
@@ -374,7 +380,6 @@ export default {
     }
   },
   mounted(){
-    console.log(this.qbfsForm);
     if(!this.qbfsForm.passFlag){
       this.qbfsForm = {}
     }
@@ -382,6 +387,7 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
       this.BZList = res.data.ENERGYTYPES //标准范围
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue

@@ -87,14 +87,6 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-           <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
-             <el-input
-               readonly
-               v-model="qbfsForm.drafterName"
-               placeholder="请输入起草人"
-               clearable
-             ></el-input>
-           </el-form-item>
            <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
              <div v-if="qbfsForm.unitName">
                <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
@@ -115,6 +107,14 @@
                ></el-input>
              </div>
            </el-form-item>
+           <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
+             <el-input
+               readonly
+               v-model="qbfsForm.drafterName"
+               placeholder="请输入起草人"
+               clearable
+             ></el-input>
+           </el-form-item>
            <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
              <el-input
                readonly
@@ -164,12 +164,16 @@
                placeholder="请输入采用标准"
                :maxlength="500"/>
            </el-form-item>
-           <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+           <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
-             <el-input
+                         class="add-form-item form-item-disabled">
-               disabled
+             <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-               v-model="qbfsForm.useLevel"
+               <el-option
-               placeholder="请输入采标程度"
+                 v-for="(item, index) in cbcdOptions"
-               :maxlength="500"/>
+                 :key="index"
+                 :value="item.value"
+                 :label="item.label">
+               </el-option>
+             </el-select>
            </el-form-item>
            <el-form-item label="延期后标准发布时间" prop="yqReleaseTime" class="add-form-item form-item-disabled">
              <el-date-picker
@@ -345,6 +349,7 @@ export default {
   data(){
     return{
       BZList: [],
+      cbcdOptions: [],
       standSortOptions: [],
       formRules: {
         bussSort: [
@@ -405,6 +410,7 @@ export default {
     }, res => {
       this.BZList = res.data.ENERGYTYPES //标准范围
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
     })
   },
   methods: {

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue

@@ -47,6 +47,12 @@
           @click.native="choiceQYBZ">
         </el-input>
       </el-form-item>
+      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
+        <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
+        <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
+                  @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
+        </el-input>
+      </el-form-item>
       <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
@@ -54,12 +60,6 @@
                   @click.native="choiceZRRS('1')">
         </el-input>
       </el-form-item>
-      <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
-        <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
-        <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
-                  @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
-        </el-input>
-      </el-form-item>
       <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px"
                     class="add-form-item form-item-disabled">
         <el-input v-model="qbfsForm.resPerson" style="display: none;"></el-input>

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue

@@ -123,18 +123,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
-              <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
-              <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
-                        @click.native="choiceZRRS('1')">
-              </el-input>
-            </el-form-item>
             <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
               <el-input v-model="qbfsForm.unit" style="display: none;"></el-input>
               <el-input v-model="qbfsForm.unitName" placeholder="请选择起草责任单位"
                         @click.native="choiceZRBM('unit', '选择起草责任单位', qbfsForm.unit)">
               </el-input>
             </el-form-item>
+            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
+              <el-input v-model="qbfsForm.drafter" style="display: none;"></el-input>
+              <el-input v-model="qbfsForm.drafterName" placeholder="请选择起草人"
+                        @click.native="choiceZRRS('1')">
+              </el-input>
+            </el-form-item>
             <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
               <el-input v-model="qbfsForm.wgLeader" style="display: none;"></el-input>
               <el-input v-model="qbfsForm.wgLeaderName" placeholder="请选择工作组组长"

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue

@@ -86,14 +86,6 @@
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
-              <el-input
-                readonly
-                v-model="qbfsForm.drafterName"
-                placeholder="请输入起草人"
-                clearable
-              ></el-input>
-            </el-form-item>
             <el-form-item label="起草责任单位" prop="unitName" class="add-form-item form-item-disabled">
               <div v-if="qbfsForm.unitName">
                 <el-tooltip class="item" effect="dark" :content="qbfsForm.unitName" placement="top-start">
@@ -114,6 +106,14 @@
                 ></el-input>
               </div>
             </el-form-item>
+            <el-form-item label="起草人" prop="drafterName" class="add-form-item form-item-disabled">
+              <el-input
+                readonly
+                v-model="qbfsForm.drafterName"
+                placeholder="请输入起草人"
+                clearable
+              ></el-input>
+            </el-form-item>
             <el-form-item label="工作组组长" prop="wgLeaderName" class="add-form-item form-item-disabled">
               <el-input
                 readonly
@@ -163,12 +163,16 @@
                 placeholder="请输入采用标准"
                 :maxlength="500"/>
             </el-form-item>
-            <el-form-item v-if="qbfsForm.isRelate === '是'" label="采标程度" style="width: 100%; margin-right:10px"  prop="useLevel" class="add-form-item form-item-disabled">
+            <el-form-item v-if="qbfsForm.isRelate === '是'" prop="useLevel" label="采标程度" style="width: 100%; margin-right:10px"
-              <el-input
+                          class="add-form-item form-item-disabled">
-                disabled
+              <el-select disabled v-model="qbfsForm.useLevel"  filterable placeholder="请选择采标程度" style="width: 100%;">
-                v-model="qbfsForm.useLevel"
+                <el-option
-                placeholder="请输入采标程度"
+                  v-for="(item, index) in cbcdOptions"
-                :maxlength="500"/>
+                  :key="index"
+                  :value="item.value"
+                  :label="item.label">
+                </el-option>
+              </el-select>
             </el-form-item>
             <el-form-item label="更名原因" prop="renameReason" class="add-form-item form-item-disabled">
               <el-input
@@ -350,6 +354,7 @@ export default {
       ListModel: false,
       standinfoList: [],
       BZList: [],
+      cbcdOptions: [],
       standSortOptions: [],
       page: 1,
       total: 0,
@@ -390,6 +395,7 @@ export default {
     this.$http.get('sys/dictype/getDicTypeListCode', '',{
       _this: this
     }, res => {
+      this.cbcdOptions = res.data.DEGREESTANDARD  //采标程度
       this.BZList = res.data.ENERGYTYPES //标准范围
       this.standSortOptions = res.data.BUSSSTANDCLASS // 标准类别
     })

src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-5.vue

@@ -43,13 +43,6 @@
               placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -57,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled

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

@@ -43,13 +43,6 @@
               placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -57,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled

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

@@ -43,13 +43,6 @@
               placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -57,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled

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

@@ -43,13 +43,6 @@
               placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -57,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled

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

@@ -43,13 +43,6 @@
               placeholder="请输入代替企标编号"
               :maxlength="500"/>
           </el-form-item>
-          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
-            <el-input
-              disabled
-              v-model="qbfsForm.drafterName"
-              placeholder="请输入起草人"
-              :maxlength="500"/>
-          </el-form-item>
           <el-form-item label="起草责任单位" style="width: 100%; margin-right:10px"  prop="unitName" class="add-form-item form-item-disabled">
             <el-input
               disabled
@@ -57,6 +50,13 @@
               placeholder="请输入起草责任单位"
               :maxlength="500"/>
           </el-form-item>
+          <el-form-item prop="drafterName" label="起草人" style="width: 100%; margin-right:10px"  class="add-form-item form-item-disabled">
+            <el-input
+              disabled
+              v-model="qbfsForm.drafterName"
+              placeholder="请输入起草人"
+              :maxlength="500"/>
+          </el-form-item>
           <el-form-item prop="resPersonName" label="评审责任人" style="width: 100%; margin-right:10px" class="add-form-item form-item-disabled">
             <el-input
               disabled