Merge branch 'refs/heads/dev-qingdao'

@@ -64,10 +64,10 @@ const permission = {
 // 遍历后台传来的路由字符串，转换为组件对象
 // 遍历后台传来的路由字符串，转换为组件对象
 function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
 function filterAsyncRouter(asyncRouterMap, lastRouter = false, type = false) {
   return asyncRouterMap.filter(route => {
   return asyncRouterMap.filter(route => {
-    // // 屏蔽包含 summary 的路由
-    // if (route.path.includes('summary')) {
-    //   return false;
-    // }
+    // 屏蔽包含 summary 的路由
+    if (route.path.includes('summary')) {
+      return false;
+    }
     if (type && route.children) {
     if (type && route.children) {
       route.children = filterChildren(route.children)
       route.children = filterChildren(route.children)
     }
     }

@@ -91,7 +91,7 @@
           <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">
+<!--            <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">
@@ -137,7 +137,7 @@
               ></el-input>
               ></el-input>
             </Formitem>
             </Formitem>
           </el-col>
           </el-col>
-            </div>
+<!--            </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
@@ -235,26 +235,26 @@
         </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-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>北京
@@ -431,7 +431,7 @@ export default {
         ecomEntEmail: "",
         ecomEntEmail: "",
         ecomEntName: "",
         ecomEntName: "",
         orderRequester: "",
         orderRequester: "",
-        methodOfSignature:  this.getDefaultMethodOfSignature(), // 设置默认值
+        //methodOfSignature:  this.getDefaultMethodOfSignature(), // 设置默认值
         certificateSerialNumber: "",
         certificateSerialNumber: "",
         certificateIndexNumber: "",
         certificateIndexNumber: "",
         qingdaoKey: "",
         qingdaoKey: "",
@@ -467,13 +467,13 @@ export default {
             message: "订单申报方不能为空！",
             message: "订单申报方不能为空！",
           },
           },
         ],
         ],
-        methodOfSignature: [
-          {
-            required: true,
-            trigger: "change",
-            message: "加密方式不能为空！",
-          },
-        ],
+        // methodOfSignature: [
+        //   {
+        //     required: true,
+        //     trigger: "change",
+        //     message: "加密方式不能为空！",
+        //   },
+        // ],
         // declarationUnit18: [
         // declarationUnit18: [
         //   {
         //   {
         //     required: true,
         //     required: true,
@@ -546,11 +546,11 @@ export default {
       }
       }
     },
     },
   },
   },
-  computed: {
-    isCipherMachine() {
-      return this.formData.methodOfSignature === 'PUBLIC_SERVICE';
-    }
-  },
+  // computed: {
+  //   isCipherMachine() {
+  //     return this.formData.methodOfSignature === 'PUBLIC_SERVICE';
+  //   }
+  // },
 
 
   created() {
   created() {
     // 确保字典数据已加载
     // 确保字典数据已加载
@@ -859,7 +859,7 @@ export default {
         ecomEntEmail: "",
         ecomEntEmail: "",
         ecomEntName: "",
         ecomEntName: "",
         orderRequester: "",
         orderRequester: "",
-        methodOfSignature: this.getDefaultMethodOfSignature(), // 重置默认值
+        //methodOfSignature: this.getDefaultMethodOfSignature(), // 重置默认值
         certificateSerialNumber: "",
         certificateSerialNumber: "",
         certificateIndexNumber: "",
         certificateIndexNumber: "",
         qingdaoKey: "",
         qingdaoKey: "",

@@ -156,10 +156,10 @@
                     <el-col :span="4">
                     <el-col :span="4">
                         <Formitem label="数量" prop="qty">
                         <Formitem label="数量" prop="qty">
                             <el-input
                             <el-input
+                                type="number"
                                 class="inputShadow"
                                 class="inputShadow"
                                 id="inputInner--qty"
                                 id="inputInner--qty"
                                 resize="none"
                                 resize="none"
-                                maxlength="14"
                                 v-model.number="tableRowformData.qty"
                                 v-model.number="tableRowformData.qty"
                                 clearable
                                 clearable
                                 placeholder=""
                                 placeholder=""
@@ -297,9 +297,14 @@
           if (value < 0) {
           if (value < 0) {
             callback(new Error('数值不能为负'));
             callback(new Error('数值不能为负'));
           } else {
           } else {
+            const valueStr = value.toString();
+            if (valueStr.length > 14) {
+              callback(new Error('最多14位'));
+            } else {
               callback();
               callback();
             }
             }
           }
           }
+        }
       };
       };
       return {
       return {
         tableRowformData:{},
         tableRowformData:{},

@@ -94,6 +94,14 @@ export default {
   watch: {
   watch: {
     outerVisible(val) {
     outerVisible(val) {
       if (val) {
       if (val) {
+        this.loadings.dialogLoading = false;
+        if (this.type == "update") {
+          this.formData = this.active;
+        } else if (this.type == "menuChange") {
+          this.formData = this.active;
+          this.searchTreeData();
+          this.loadCheckedKeys();//加载已绑定的菜单
+        }
       }
       }
     },
     },
   },
   },
@@ -128,20 +136,6 @@ export default {
       loadingText: "",
       loadingText: "",
     };
     };
   },
   },
-  watch: {
-    outerVisible(val) {
-      if (val) {
-        this.loadings.dialogLoading = false;
-        if (this.type == "update") {
-          this.formData = this.active;
-        } else if (this.type == "menuChange") {
-          this.formData = this.active;
-          this.searchTreeData();
-          this.loadCheckedKeys();//加载已绑定的菜单
-        }
-      }
-    },
-  },
   methods: {
   methods: {
     //查询菜单数据
     //查询菜单数据
     searchTreeData() {
     searchTreeData() {