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

@@ -8,7 +8,7 @@ const whiteList = ['/login', '/auth-redirect', '/bind', '/register', '/relogin']
 
 
 router.beforeEach((to, from, next) => {
-  
+
   if (to.path == '/relogin') {
     next()
   } else {
@@ -24,7 +24,7 @@ router.beforeEach((to, from, next) => {
           store.dispatch('GetInfo').then((res) => {
             // if (res.success) {
             store.dispatch('GenerateRoutes').then(accessRoutes => {
-              store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT','TEMPLATE_TYPE','PACKAGE_TYPE_CODE', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY','COUNTRY_REGION_CODE', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY','APP_STATUS']);
+              store.dispatch("GetDict", ['DECLARE_F_FLAG', 'MEASUREMENT_UNIT','TEMPLATE_TYPE','PACKAGE_TYPE_CODE', 'RECEIPT_STATUS', 'DECLARE_APPTYPE', 'CURRENCY','COUNTRY_REGION_CODE', 'DECLARE_STATISTICS_FLAG', 'ORDER_DECLARATION_PARTY','APP_STATUS','METHOD_OF_SIGNATURE']);
               // 根据roles权限生成可访问的路由表
               router.addRoutes(accessRoutes) // 动态添加可访问路由表
               next({ ...to, replace: true }) // hack方法 确保addRoutes已完成

@@ -76,12 +76,6 @@
                 maxlength="4"
                 placeholder=""
               >
-                <!-- <el-option
-                  v-for="(item, index) in dict.orderRequester"
-                  :key="index"
-                  :label="item.name"
-                  :value="item.value"
-                ></el-option> -->
                 <el-option
                 v-for="(item, index) in $store.getters.dict.ORDER_DECLARATION_PARTY"
                 :key="index"
@@ -91,13 +85,32 @@
               </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"
+                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>
         <div v-if="formData.orderRequester=='2'">
           <div class="checkTitle">
           <el-checkbox v-model="formData.qdCheck" @change="changeQDCheckBox()"></el-checkbox>青岛
-        </div>
-        <el-row :gutter="5">
+          </div>
+          <el-row :gutter="5">
           <!-- 公服DXPID -->
           <el-col :span="8">
             <Formitem label="公服DXPID" prop="qingdaoUserDxpid" type="edit">
@@ -220,7 +233,7 @@
                   class="el-icon-user-solid"
                   icon-class="exl"
                   style="font-size: 18px; color: #de002e"
-                />                
+                />
                 <Tooltip
                   :content="formData.qingdaoFile ? formData.qingdaoFile.name : formData.qingdaoCertificatePath.split('/').pop()"
                   :refName="formData.qingdaoFile ? formData.qingdaoFile.name : formData.qingdaoCertificatePath.split('/').pop()"
@@ -261,6 +274,8 @@
             </Formitem>
           </el-col>
         </el-row>
+        </div>
+          <div v-if="isCipherMachine">
         <section class="dlTitle">
           <h3>密码机管理</h3>
         </section>
@@ -348,7 +363,8 @@
         </el-col>
 
        </el-row>
-        </div>
+          </div>
+
       </el-form>
     </div>
     <div class="dialogOption entrySave">
@@ -414,6 +430,7 @@ export default {
         ecomEntEmail: "",
         ecomEntName: "",
         orderRequester: "",
+        methodOfSignature:  this.getDefaultMethodOfSignature(), // 设置默认值
         certificateSerialNumber: "",
         certificateIndexNumber: "",
         qingdaoKey: "",
@@ -440,7 +457,7 @@ export default {
             trigger: "blur",
             message: "电商企业名称不能为空！",
           },
-         
+
         ],
         orderRequester: [
           {
@@ -449,6 +466,13 @@ export default {
             message: "订单申报方不能为空！",
           },
         ],
+        methodOfSignature: [
+          {
+            required: true,
+            trigger: "change",
+            message: "加密方式不能为空！",
+          },
+        ],
         // declarationUnit18: [
         //   {
         //     required: true,
@@ -515,8 +539,46 @@ export default {
         }
       }
     },
+    type(newVal) {
+      if (newVal === "add") {
+        this.setDefaultMethodOfSignature(); // 确保默认值被设置
+      }
+    },
+  },
+  computed: {
+    isCipherMachine() {
+      console.log("11",this.formData.methodOfSignature === 'CIPHER_MACHINE')
+      return this.formData.methodOfSignature === 'CIPHER_MACHINE';
+    }
+  },
+
+  created() {
+    // 确保字典数据已加载
+    if (this.$store.getters.dict.METHOD_OF_SIGNATURE.length > 0) {
+      this.setDefaultMethodOfSignature();
+    } else {
+      // 监听字典数据变化
+      this.$store.watch(
+        (state) => state.dict.METHOD_OF_SIGNATURE,
+        (newVal) => {
+          if (newVal.length > 0) {
+            this.setDefaultMethodOfSignature();
+          }
+        }
+      );
+    }
   },
   methods: {
+    getDefaultMethodOfSignature() {
+      const methodOfSignatureDict = this.$store.getters.dict.METHOD_OF_SIGNATURE;
+      if (methodOfSignatureDict.length > 0) {
+        return methodOfSignatureDict[0].itemValue;
+      }
+      return "";
+    },
+    setDefaultMethodOfSignature() {
+      this.formData.methodOfSignature = this.getDefaultMethodOfSignature();
+    },
     changeQDCheckBox(){
       this.$forceUpdate()
       if(!this.formData.qdCheck){
@@ -557,7 +619,7 @@ export default {
     fileUpload({ file }) {
 
     const reader = new FileReader();
-    reader.readAsDataURL(file); 
+    reader.readAsDataURL(file);
     reader.onload = (e) => {
       console.log(e);
       let obj = {
@@ -566,12 +628,12 @@ export default {
       };
        this.formData.file = obj;
     };
-    
+
   },
   qingdaoFileUpload({ file }) {
 
     const reader = new FileReader();
-    reader.readAsDataURL(file); 
+    reader.readAsDataURL(file);
     reader.onload = (e) => {
       console.log(e);
       let obj = {
@@ -580,7 +642,7 @@ export default {
       };
       this.formData.qingdaoFile = obj;
     };
-   
+
     },
     fileChange(val) {},
     qingdaoFileChange(val) {},
@@ -695,13 +757,13 @@ export default {
         if (res.code === "200") {
           if (this.formData.file) {
             this.uploadCertificate(val.ecomEntCode,  this.base64ConvertFile(this.formData.file.file,this.formData.file.name));
-          } 
+          }
           if (this.formData.qingdaoFile) {
             this.uploadQingdaoCertificate(val.ecomEntCode,  this.base64ConvertFile(this.formData.qingdaoFile.file,this.formData.qingdaoFile.name));
-          } 
+          }
           this.msgSuccess("客户添加成功！");
           this.close();
-          
+
         } else {
           this.alertWarningMsg(res.message);
           this.loadings.dialogLoading = false;
@@ -713,7 +775,7 @@ export default {
       });
   },
   uploadCertificate(ecomEntCode, file) {
-    
+
     uploadCertificate(ecomEntCode, file)
       .then((uploadRes) => {
         if (uploadRes.code === "200") {
@@ -731,7 +793,7 @@ export default {
   },
 
   uploadQingdaoCertificate(ecomEntCode, file) {
-    
+
     uploadQingdaoCertificate(ecomEntCode, file)
       .then((uploadRes) => {
         if (uploadRes.code === "200") {
@@ -762,7 +824,7 @@ export default {
             }
             this.msgSuccess("客户修改成功！");
             this.close();
-            
+
           } else {
             this.alertWarningMsg(res.message);
             this.loadings.dialogLoading = false;
@@ -785,7 +847,7 @@ export default {
         this.formData.qdCheck=checkboxStateBooleans[0];
         this.formData.bjCheck=checkboxStateBooleans[1];
       }
-      
+
     },
     close() {
       this.formData = {
@@ -797,6 +859,7 @@ export default {
         ecomEntEmail: "",
         ecomEntName: "",
         orderRequester: "",
+        methodOfSignature: this.getDefaultMethodOfSignature(), // 重置默认值
         certificateSerialNumber: "",
         certificateIndexNumber: "",
         qingdaoKey: "",

@@ -286,8 +286,8 @@ export default {
       })
     },
     dateChange(val){
-      this.formData.startTime = val[0]
-      this.formData.endTime = val[1]
+      this.formData.startTime = val[0] + ' 00:00:00'
+      this.formData.endTime = val[1] + ' 23:59:59'
     },
     getDeclareType(){
       getDictData({