Merge branch 'dev0.3' of http://36.137.93.232:3000/hf/byte-sailing-new into dev0.3

connect/E-mail/businessConfig/index.vue

@@ -110,7 +110,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >
@@ -147,7 +147,7 @@
         >
         <!-- <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

connect/E-mail/personalConfig/index.vue

@@ -79,7 +79,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/components/WDLY/product/SelectProduct.vue

@@ -202,7 +202,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/components/byForm/index.vue

@@ -56,7 +56,8 @@
             v-model="formData[i.prop]"
             :placeholder="i.placeholder || $t('common.pleaseEnter')"
             @input="(e) => commonsEmit(e, i)"
-            :type="i.itemType ? i.itemType : 'text'"
+            :type="'number'"
+            :precision="4"
             :disabled="i.disabled ? i.disabled : false"
             :max="i.max"
             :min="i.min"

src/components/product/SelectMaterial.vue

@@ -71,7 +71,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/components/product/SelectProduct.vue

@@ -71,7 +71,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/components/product/treeList.vue

@@ -74,7 +74,7 @@
         <el-button @click="treeModal = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/directive/permission/noDoubleClick.js

@@ -1,5 +1,5 @@
 // 自定义指令定义  
-{/* demo <div v-no-double-click="myMethod">Click me</div>   */ }
+/* demo <div v-no-double-click="myMethod">Click me</div>   */ 
 
 export default {
     mounted(el, binding, vnode) {
@@ -8,7 +8,6 @@ export default {
 
         // 监听元素的点击事件  
         el.addEventListener('click', function (event) {
-            console.log(lastClickTime)
             if(lastClickTime == 0){
                 binding.value(event);
                 lastClickTime = Date.now();
@@ -21,27 +20,13 @@ export default {
                 if (currentTime - lastClickTime > doubleClickInterval) {
                     // 阻止默认行为  
                     event.preventDefault();
-                    binding.value(event);
+                    binding.value(event);  
                     // 更新上一次点击的时间戳
                     lastClickTime = currentTime;
                 }
             }
             
         });
-        // let clickTimer;
-        // console.log(el, binding, vnode)
-        // console.log('v-no-double-click mounted')
-        // el.addEventListener('click', function (event) {
-        //     if (clickTimer) {
-        //         // 如果上一次点击的计时器还存在，则取消计时器并阻止连续点击  
-        //         clearTimeout(clickTimer);
-        //     }
-
-        //     // 创建一个延迟执行的函数，以防止连续点击  
-        //     clickTimer = setTimeout(() => {
-        //         binding.value(event)
-        //     }, 200); // 设置延迟时间（毫秒）  
-        // });
     },
     // 在元素被插入到 DOM 中时被调用  
     inserted: function (el, binding, vnode) {

src/views/EHSD/productLibrary/companyProduct/index.vue

@@ -107,7 +107,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
           >确 定</el-button

src/views/EHSD/productLibrary/customerProduct/index.vue

@@ -106,7 +106,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
           >确 定</el-button

src/views/JXSK/production/bom/index.vue

@@ -146,7 +146,7 @@
           >
           <el-button
             type="primary"
-            @click="submitForm('byform')"
+            v-no-double-click="submitForm"
             size="large"
             :loading="submitLoading"
           >

src/views/JXSK/production/workOrder/index.vue

@@ -90,7 +90,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/JXSK/warehouseConfig/warehouse/index.vue

@@ -44,7 +44,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/basic/product/index.vue

@@ -254,7 +254,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/basic/spu/index.vue

@@ -66,7 +66,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/basic/supplier/index.vue

@@ -133,7 +133,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/outInBound/abnormal/index.vue

@@ -40,7 +40,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/outInBound/jdOrderReceive/index.vue

@@ -139,7 +139,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/outInBound/logistics/index.vue

@@ -95,7 +95,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/outInBound/transfer/index.vue

@@ -157,7 +157,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/outInBound/waitInBound/index.vue

@@ -75,7 +75,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/outInBound/waitOutBound/index.vue

@@ -147,7 +147,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/process/porcessDefinition/index.vue

@@ -46,7 +46,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 				>

src/views/WDLY/process/processConfig/index.vue

@@ -55,7 +55,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 				>

src/views/WDLY/purchaseManage/payment/index.vue

@@ -104,7 +104,7 @@
         <el-button @click="handleClose" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/purchaseManage/purchase/index.vue

@@ -42,7 +42,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/purchaseManage/subscribe/index.vue

@@ -49,7 +49,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/salesMange/afterSale/index.vue

@@ -171,7 +171,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/salesMange/jdOrder/index.vue

@@ -194,7 +194,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/salesMange/jdReGoodsInspection/index.vue

@@ -142,7 +142,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/salesMange/order/index.vue

@@ -177,7 +177,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/stockManage/productCombination/index.vue

@@ -94,7 +94,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/stockManage/productSplit/index.vue

@@ -94,7 +94,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/stockManage/query/index.vue

@@ -47,7 +47,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/WDLY/stockManage/receiptData/index.vue

@@ -48,7 +48,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/connect/E-mail/businessConfig/index.vue

@@ -110,7 +110,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >
@@ -147,7 +147,7 @@
         >
         <!-- <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/connect/E-mail/personalConfig/index.vue

@@ -79,7 +79,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/finance/fundManage/accountStatement/index.vue

@@ -60,7 +60,7 @@
       </byTable>
     </div>
     <el-dialog title="内部转账" v-if="transferMoneyModal" v-model="transferMoneyModal" width="600" v-loading="loadingDialog">
-      <byForm :formConfig="transferMoneyConfig" :formOption="formOption" v-model="formData2.data" :rules="rules" ref="transferMoneySubmit">
+      <byForm :formConfig="transferMoneyConfig" :formOption="formOption" v-model="formData2.data" :rules="rules2" ref="transferMoneySubmit">
       </byForm>
       <template #footer>
         <el-button @click="transferMoneyModal = false" size="large">取 消</el-button>
@@ -496,6 +496,16 @@ const transferMoneyConfig = computed(() => {
 			placeholder: '请输入',
 			selectPlaceholder: '币种',
 			selectProp: 'currency',
+      fn: (value) => {
+        if (value != '') {
+          if (value.indexOf('.') > -1) {
+              formData2.data.amount = value.slice(0, value.indexOf('.') + 3)
+          } else { 
+            formData2.data.amount = value
+          }
+      }
+        formData2.data.inAmount = formData2.data.amount
+      },
 		},
     
     { 
@@ -853,7 +863,21 @@ const formConfigOne = computed(() => {
     },
   ];
 });
-
+const validatePass = (rule, value, callback) => {
+  console.log(formData2.data.currency);
+  if (!formData2.data.currency) {
+    callback(new Error("请输入金额和选择币种"));
+  } else {
+    callback();
+  }
+};
+const validatePass2 = (rule, value, callback) => {
+  if (!formData2.data.inCurrency) {
+    callback(new Error("请输入金额和选择币种"));
+  } else {
+    callback();
+  }
+};
 const rules = ref({
   accountManagementId: [
     { required: true, message: "请选择账户", trigger: "change" },
@@ -868,13 +892,29 @@ const rules = ref({
   ],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
   inAccountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
-  inAmount: [{ required: true, message: "请输入金额", trigger: "blur" }],
+  inAmount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass2, trigger: "blur" }],
   isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
   transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
   // name: [{ required: true, message: "请输入账户名称", trigger: "blur" }],
   // openingBank: [{ required: true, message: "请输入开户银行", trigger: "blur" }],
   // accountOpening: [{ required: true, message: "请输入银行账号", trigger: "blur" }],
 });
+
+
+const rules2 = ref({
+  accountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
+  transactionTime: [{ required: true, message: "请选择交易时间", trigger: "change" }],
+  status: [{ required: true, message: "请选择收支类型", trigger: "change" }],
+  currency: [{ required: true, message: "请选择币种", trigger: "change" }],
+  received: [{ required: true, message: "请选择合同是否到账", trigger: "change" }],
+  inAccountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
+  inAmount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass2, trigger: "blur" }],
+  isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
+  transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
+  amount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass, trigger: "blur" }]
+});
+
+
 const rulesOne = ref({
   accountManagementId: [
     { required: true, message: "请选择账户", trigger: "change" },

src/views/finance/fundManage/flow/index.vue

@@ -101,7 +101,7 @@
       </template>
     </el-dialog>
     <el-dialog title="内部转账" v-if="transferMoneyModal" v-model="transferMoneyModal" width="600" v-loading="loadingDialog">
-      <byForm :formConfig="transferMoneyConfig" :formOption="formOption" v-model="formData2.data" :rules="rules" ref="transferMoneySubmit">
+      <byForm :formConfig="transferMoneyConfig" :formOption="formOption" v-model="formData2.data" :rules="rules2" ref="transferMoneySubmit">
       </byForm>
       <template #footer>
         <el-button @click="transferMoneyModal = false" size="large">取 消</el-button>
@@ -407,6 +407,9 @@ getDict();
 getList();
 let transferMoneyModal = ref(false);
 const openTransferMoney = () => {
+  formData2.data = {
+    transactionTime: moment().format("yyyy-MM-DD HH:mm:ss"),
+  };
   transferMoneyModal.value = true;
 };
 const modalType = ref("add");
@@ -447,6 +450,16 @@ const transferMoneyConfig = computed(() => {
 			placeholder: '请输入',
 			selectPlaceholder: '币种',
 			selectProp: 'currency',
+      fn: (value) => {
+        if (value != '') {
+          if (value.indexOf('.') > -1) {
+              formData2.data.amount = value.slice(0, value.indexOf('.') + 3)
+          } else { 
+            formData2.data.amount = value
+          }
+      }
+        formData2.data.inAmount = formData2.data.amount
+      },
 		},
     
     { 
@@ -630,20 +643,44 @@ const formConfig = computed(() => {
     },
   ];
 });
+const validatePass = (rule, value, callback) => {
+  console.log(formData2.data.currency);
+  if (!formData2.data.currency) {
+    callback(new Error("请输入金额和选择币种"));
+  } else {
+    callback();
+  }
+};
+const validatePass2 = (rule, value, callback) => {
+  if (!formData2.data.inCurrency) {
+    callback(new Error("请输入金额和选择币种"));
+  } else {
+    callback();
+  }
+};
 const rules = ref({
   accountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
   transactionTime: [{ required: true, message: "请选择交易时间", trigger: "change" }],
   status: [{ required: true, message: "请选择收支类型", trigger: "change" }],
   currency: [{ required: true, message: "请选择币种", trigger: "change" }],
   received: [{ required: true, message: "请选择合同是否到账", trigger: "change" }],
+  inAccountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
+  inAmount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass2, trigger: "blur" }],
+  isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
+  transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
   amount: [{ required: true, message: "请输入金额", trigger: "blur" }],
+});
+const rules2 = ref({
+  accountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
+  transactionTime: [{ required: true, message: "请选择交易时间", trigger: "change" }],
+  status: [{ required: true, message: "请选择收支类型", trigger: "change" }],
+  currency: [{ required: true, message: "请选择币种", trigger: "change" }],
+  received: [{ required: true, message: "请选择合同是否到账", trigger: "change" }],
   inAccountManagementId: [{ required: true, message: "请选择账户", trigger: "change" }],
-  inAmount: [{ required: true, message: "请输入金额", trigger: "blur" }],
+  inAmount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass2, trigger: "blur" }],
   isTransaction: [{ required: true, message: "请选择是否往来", trigger: "change" }],
   transactionDeptId: [{ required: true, message: "请选择往来单位", trigger: "change" }],
-  // name: [{ required: true, message: "请输入账户名称", trigger: "blur" }],
-  // openingBank: [{ required: true, message: "请输入开户银行", trigger: "blur" }],
-  // accountOpening: [{ required: true, message: "请输入银行账号", trigger: "blur" }],
+  amount: [{ required: true, message: "请输入金额和选择币种", trigger: "blur" }, { required: true, validator: validatePass, trigger: "blur" }]
 });
 const openModal = (val) => {
   modalType.value = val;
@@ -675,9 +712,9 @@ const changeStatus = () => {
 const transferMoneySubmit = ref(null);
 const submitForm2 = () => {
   transferMoneySubmit.value.handleSubmit(() => {
-    
+    console.log(formData2.data)
     loadingDialog.value = true;
-    proxy.post("/accountRunningWater/internalTransfer", formData2.data).then(
+    proxy.post("/accountRunningWater/internalTransfer", {...formData2.data}).then(
       () => {
         ElMessage({
           message: modalType.value == "add" ? "转账成功" : "转账成功",

src/views/iot/base/equipment/index.vue

@@ -44,7 +44,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/iot/base/loT/index.vue

@@ -44,7 +44,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/iot/base/product/index.vue

@@ -44,7 +44,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/iot/base/trade/index.vue

@@ -45,7 +45,7 @@
         <el-button
           v-if="modalType == 'add'"
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/oa/mailList/interior/index.vue

@@ -113,7 +113,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/oa/mailList/outside/index.vue

@@ -189,7 +189,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/process/dealWith/backlog.vue

@@ -42,7 +42,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 				>

src/views/process/dealWith/index.vue

@@ -40,7 +40,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 				>

src/views/process/flowExample/index.vue

@@ -40,7 +40,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 				>

src/views/process/porcessDefinition/index.vue

@@ -29,7 +29,7 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform"> </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading">确 定</el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading">确 定</el-button>
       </template>
     </el-dialog>
   </div>

src/views/process/processConfig/index.vue

@@ -56,7 +56,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 				>

src/views/process/processConfig/vueFlow.vue

@@ -34,7 +34,7 @@
 			</el-button>
 			<el-button
 				type="primary"
-				@click="submitForm('byform')"
+				v-no-double-click="submitForm"
 				size="large"
 				:loading="submitLoading"
 			>

src/views/product/material/index.vue

@@ -90,7 +90,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/product/product/index.vue

@@ -109,7 +109,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/product/product/index2.vue

@@ -87,7 +87,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/production/factory/farm/index.vue

@@ -44,7 +44,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/production/factory/line/index.vue

@@ -44,7 +44,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/production/project/bom/index.vue

@@ -141,7 +141,7 @@
           >
           <el-button
             type="primary"
-            @click="submitForm('byform')"
+            v-no-double-click="submitForm"
             size="large"
             :loading="submitLoading"
           >

src/views/production/project/processes/index.vue

@@ -82,7 +82,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/production/project/technology/index.vue

@@ -107,7 +107,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/publicModule/KDconfig/index.vue

@@ -44,7 +44,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/publicModule/companyConfig/index.vue

@@ -204,7 +204,7 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading">确 定</el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading">确 定</el-button>
       </template>
     </el-dialog>
   </div>

src/views/purchaseManage/purchaseManage/purchase/index.vue

@@ -130,7 +130,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/purchaseManage/purchaseManage/subscribe/index.vue

@@ -128,7 +128,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/purchaseManage/supplier/supplyPrice/index.vue

@@ -108,7 +108,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/purchaseSales/stockManage/inventory/index.vue

@@ -111,7 +111,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/purchaseSales/warehouseConfig/warehouse/index.vue

@@ -44,7 +44,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/salesMange/saleContract/claim/index.vue

@@ -74,7 +74,7 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading"> 确 定 </el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading"> 确 定 </el-button>
       </template>
     </el-dialog>
 

src/views/salesMange/salesMange/profitSettlement/index.vue

@@ -306,7 +306,7 @@
                     v-model="row.rate"
                     placeholder="请输入兑 CHY 汇率"
                     style="width: 100%"
-                    :precision="6"
+                    :precision="4"
                     :controls="false"
                     :min="0"
                   />

src/views/salesMange/shipmentMange/document/index.vue

@@ -2383,10 +2383,19 @@
                 <tr>
                   <td
                     colspan="2"
-                    style="text-align: left; height: 120px; vertical-align: top"
+                    style="
+                      text-align: left;
+                      height: 120px;
+                      vertical-align: top;
+                      position: relative;
+                    "
                   >
-                    <span> 其他要求：</span>
-                    <span v-if="textShowOne">{{ mandateData.otherAsk }}</span>
+                    <span style="position: absolute; left: 8px; top: 4px">
+                      其他要求：</span
+                    >
+                    <span v-if="textShowOne" style="margin-left: 65px">{{
+                      mandateData.otherAsk
+                    }}</span>
                     <el-input
                       autosize
                       placeholder="请输入"
@@ -2395,7 +2404,7 @@
                       v-model="mandateData.otherAsk"
                       size="small"
                       :rows="5"
-                      style="width: 82%"
+                      style="width: 82%; margin-left: 65px"
                     />
                   </td>
                 </tr>
@@ -2451,7 +2460,7 @@
                     colspan="2"
                     style="
                       text-align: left;
-                      height: 77.5px;
+                      height: 80.05px;
                       vertical-align: top;
                     "
                   >
@@ -2509,9 +2518,7 @@
         </div>
       </div>
       <template #footer>
-        <el-button @click="openCustomsDeclaration = false" size="large"
-          >取消</el-button
-        >
+        <el-button @click="mandateDialog = false" size="large">取消</el-button>
         <el-button
           type="primary"
           @click="textShowOne = !textShowOne"

src/views/system/addressConfig/index.vue

@@ -148,7 +148,12 @@ const formConfig = computed(() => {
       prop: "code",
       label: "地区代码",
     },
-    
+    {
+      type: "input",
+      prop: "icon",
+      label: "国旗矢量图名称",
+      isShow: formData.data.levelCode == 1
+    },
   ];
 });
 
@@ -279,6 +284,7 @@ const submitForm = () => {
           type: "success",
         });
         dialogVisible.value = false;
+        loadingDialog.value = false;
         tableData.value = []
         getList();
       },
@@ -290,7 +296,7 @@ const submitForm = () => {
   });
 };
 /** 删除按钮操作 */
-function handleDelete(row) {
+function handleDelete(index,row) {
   ElMessageBox.confirm(
     "此操作将永久删除该数据, 是否继续?",
     "提示",

src/views/system/dept2/index.vue

@@ -63,7 +63,7 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">{{$t('common.cancel')}}</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading">{{$t('common.confirm')}}</el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading">{{$t('common.confirm')}}</el-button>
       </template>
     </el-dialog>
     <el-dialog title="修改密码" v-model="roomDialogVisible" width="500" :before-close="handleClose" v-loading="loading">

src/views/system/dict/dictCommonDtl.vue

@@ -36,7 +36,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 				>

src/views/system/dict/dictCommonType.vue

@@ -46,7 +46,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 				>

src/views/system/dict/dictTenantDtl.vue

@@ -34,7 +34,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/system/dict/dictTenantType.vue

@@ -72,7 +72,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 				>

src/views/system/feedback/index.vue

@@ -32,7 +32,7 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading"> 确 定 </el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading"> 确 定 </el-button>
       </template>
     </el-dialog>
     <el-dialog title="修改密码" v-model="roomDialogVisible" width="300" :before-close="handleClose" v-loading="loading">

src/views/system/langConfig/index.vue

@@ -48,7 +48,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading"
 					>确 定</el-button

src/views/system/role2/index - 副本.vue

@@ -63,7 +63,7 @@
 				>
 				<el-button
 					type="primary"
-					@click="submitForm('byform')"
+					v-no-double-click="submitForm"
 					size="large"
 					:loading="submitLoading">
 					确 定

src/views/system/role2/index.vue

@@ -39,7 +39,7 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform"> </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading">确 定</el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading">确 定</el-button>
       </template>
     </el-dialog>
     <el-dialog title="权限配置" v-model="roomDialogVisible" width="500" :before-close="handleClose" v-loading="loading">

src/views/system/tenant/index.vue

@@ -36,7 +36,7 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform"> </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading">确 定</el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading">确 定</el-button>
       </template>
     </el-dialog>
 

src/views/system/user2/index.vue

@@ -39,7 +39,7 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading">确 定</el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading">确 定</el-button>
       </template>
     </el-dialog>
     <el-dialog title="修改密码" v-model="roomDialogVisible" width="300" :before-close="handleClose" v-loading="loading">

src/views/systemTenant/tenant/dictTenant/dictTenantDtl.vue

@@ -34,7 +34,7 @@
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
         <el-button
           type="primary"
-          @click="submitForm('byform')"
+          v-no-double-click="submitForm"
           size="large"
           :loading="submitLoading"
         >

src/views/systemTenant/tenant/dictTenant/index.vue

@@ -23,7 +23,7 @@
       <byForm :formConfig="formConfig" :formOption="formOption" v-model="formData.data" :rules="rules" ref="byform"> </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm('byform')" size="large" :loading="submitLoading">确 定</el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large" :loading="submitLoading">确 定</el-button>
       </template>
     </el-dialog>
 

src/views/systemTenant/tenant/userTenant/index.vue

@@ -36,7 +36,7 @@
       </byForm>
       <template #footer>
         <el-button @click="dialogVisible = false" size="large">取 消</el-button>
-        <el-button type="primary" @click="submitForm()" size="large">确 定</el-button>
+        <el-button type="primary" v-no-double-click="submitForm" size="large">确 定</el-button>
       </template>
     </el-dialog>