Merge remote-tracking branch 'origin/dev-jiaxing.zhou'

@@ -85,32 +85,13 @@
               </el-select>
               </el-select>
             </Formitem>
             </Formitem>
           </el-col>
           </el-col>
-          <!-- 加密方式 -->
-          <el-col :span="8">
-            <Formitem label="加密方式" prop="methodOfSignature" type="edit">
-              <el-select
-                type="text"
-                id="inputInner-edit-methodOfSignature"
-                v-model="formData.methodOfSignature"
-                clearable
-                maxlength="4"
-                placeholder=""
-              >
-                <el-option
-                  v-for="(item, index) in $store.getters.dict.METHOD_OF_SIGNATURE"
-                  :key="index"
-                  :label="item.itemChineseName"
-                  :value="item.itemValue"
-                ></el-option>
-              </el-select>
-            </Formitem>
-          </el-col>
         </el-row>
         </el-row>
         <div v-if="formData.orderRequester=='2'">
         <div v-if="formData.orderRequester=='2'">
           <div class="checkTitle">
           <div class="checkTitle">
           <el-checkbox v-model="formData.qdCheck" @change="changeQDCheckBox()"></el-checkbox>青岛
           <el-checkbox v-model="formData.qdCheck" @change="changeQDCheckBox()"></el-checkbox>青岛
           </div>
           </div>
           <el-row :gutter="5">
           <el-row :gutter="5">
+            <div v-if="isCipherMachine">
           <!-- 公服DXPID -->
           <!-- 公服DXPID -->
           <el-col :span="8">
           <el-col :span="8">
             <Formitem label="公服DXPID" prop="qingdaoUserDxpid" type="edit">
             <Formitem label="公服DXPID" prop="qingdaoUserDxpid" type="edit">
@@ -156,6 +137,7 @@
               ></el-input>
               ></el-input>
             </Formitem>
             </Formitem>
           </el-col>
           </el-col>
+            </div>
           <el-col :span="8">
           <el-col :span="8">
             <Formitem label="山电DXPID" prop="qingdaoDanyiUserDxpid" type="edit">
             <Formitem label="山电DXPID" prop="qingdaoDanyiUserDxpid" type="edit">
               <el-input
               <el-input
@@ -170,7 +152,6 @@
               ></el-input>
               ></el-input>
             </Formitem>
             </Formitem>
           </el-col>
           </el-col>
-
            <el-col :span="8">
            <el-col :span="8">
             <Formitem label="山电用户名" prop="qingdaoUserName" type="edit">
             <Formitem label="山电用户名" prop="qingdaoUserName" type="edit">
               <el-input
               <el-input
@@ -253,6 +234,27 @@
           </div>
           </div>
         </div>
         </div>
         </el-col>
         </el-col>
+            <!-- 加密方式 -->
+            <el-col :span="8">
+              <Formitem label="加密方式" prop="methodOfSignature" type="edit">
+                <el-select
+                  type="text"
+                  id="inputInner-edit-methodOfSignature"
+                  v-model="formData.methodOfSignature"
+                  clearable
+                  maxlength="4"
+                  :disabled="!formData.qdCheck"
+                  placeholder=""
+                >
+                  <el-option
+                    v-for="(item, index) in $store.getters.dict.METHOD_OF_SIGNATURE"
+                    :key="index"
+                    :label="item.itemChineseName"
+                    :value="item.itemValue"
+                  ></el-option>
+                </el-select>
+              </Formitem>
+            </el-col>
         </el-row>
         </el-row>
         <div class="checkTitle">
         <div class="checkTitle">
           <el-checkbox v-model="formData.bjCheck" @change="changeBJCheckBox()"></el-checkbox>北京
           <el-checkbox v-model="formData.bjCheck" @change="changeBJCheckBox()"></el-checkbox>北京
@@ -274,8 +276,8 @@
             </Formitem>
             </Formitem>
           </el-col>
           </el-col>
         </el-row>
         </el-row>
-        </div>
-          <div v-if="isCipherMachine">
+
+
         <section class="dlTitle">
         <section class="dlTitle">
           <h3>密码机管理</h3>
           <h3>密码机管理</h3>
         </section>
         </section>
@@ -364,7 +366,6 @@
 
 
        </el-row>
        </el-row>
         </div>
         </div>
-
       </el-form>
       </el-form>
     </div>
     </div>
     <div class="dialogOption entrySave">
     <div class="dialogOption entrySave">
@@ -547,8 +548,7 @@ export default {
   },
   },
   computed: {
   computed: {
     isCipherMachine() {
     isCipherMachine() {
-      console.log("11",this.formData.methodOfSignature === 'CIPHER_MACHINE')
-      return this.formData.methodOfSignature === 'CIPHER_MACHINE';
+      return this.formData.methodOfSignature === 'OTHERS';
     }
     }
   },
   },