bug fix

src/utils/crypto.js

@@ -4,14 +4,8 @@ import Utf8 from 'crypto-js/enc-utf8';
 import AES from 'crypto-js/aes';
 import SHA1 from 'crypto-js/sha1';
 import MD5 from 'crypto-js/md5';
-import { cookie } from '@/utils/tool';
 import SparkMD5 from 'spark-md5';
 
-if (!cookie.get('deviceId')) {
-  cookie.set('deviceId', MD5(Math.random() + '-' + Date.now()));
-}
-export const DEVICE_ID = cookie.get('deviceId');
-
 export const getBase64 = (content) => {
   const words = Utf8.parse(content);
   const base64Str = Base64.stringify(words);

src/utils/request.js

@@ -3,11 +3,17 @@ import { MessagePlugin as Message } from 'tdesign-vue-next';
 import { download, clear } from '@/utils/tool';
 import { get, isEmpty } from 'lodash';
 import qs from 'qs';
-import { h } from 'vue';
+// import { h } from 'vue';
 import { LoadingPlugin } from 'tdesign-vue-next';
-import { getAuthorization, DEVICE_ID } from './crypto';
+import { getAuthorization } from './crypto';
 import router from '@/router';
 import { initSyncTime, fetchTime } from './syncServerTime';
+import { cookie } from '@/utils/tool';
+
+if (!cookie.get('deviceId')) {
+  cookie.set('deviceId', MD5(Math.random() + '-' + Date.now()));
+}
+const DEVICE_ID = cookie.get('deviceId');
 
 function setAuth(config) {
   let userSession = sessionStorage.getItem('user');

src/views/sop/components/dynamic-form-item/device-table/edit-column-dialog.vue

@@ -32,8 +32,16 @@
       <t-form-item v-if="!isOutType" label="总扫描量" name="scanCount">
         <t-input v-model="formData.inOutType"></t-input>
       </t-form-item>
-      <t-form-item v-if="isOutType" label="发往地" name="address" required-mark>
-        <select-area v-model="formData.address" value-type="full"></select-area>
+      <t-form-item
+        v-if="isOutType"
+        label="发往地"
+        name="addressArr"
+        required-mark
+      >
+        <select-area
+          v-model="formData.addressArr"
+          value-type="full"
+        ></select-area>
       </t-form-item>
       <t-form-item label="快递单拍照" name="basePhotoPath">
         <my-upload
@@ -74,7 +82,8 @@ const formData = reactive({
   deviceStatus: '',
   scanCount: '',
   location: '',
-  address: ['', '', ''],
+  address: '',
+  addressArr: ['', '', ''],
   basePhotoPath: '',
 });
 
@@ -107,11 +116,10 @@ const rules = {
       trigger: 'change',
     },
   ],
-  address: [
+  addressArr: [
     {
       validator: () => {
-        console.log(formData.address);
-        if (formData.address.some((item) => !item))
+        if (formData.addressArr.some((item) => !item))
           return { result: false, message: '发往地必选' };
 
         return { result: true, type: 'success' };
@@ -157,6 +165,7 @@ const dialogOpened = async () => {
 const save = async () => {
   const valid = await formRef.value.validate();
   if (valid !== true) return;
+  formData.address = formData.addressArr.join('');
 
   emit('update:visible', false);
   emit('success', formData);

src/views/sop/components/dynamic-form-item/device-table/index.vue

@@ -34,13 +34,19 @@
         />
       </template>
     </t-table>
-    <t-button class="m-t-10px" theme="primary" @click="handleAdd">
+    <t-button
+      v-if="!readonly"
+      class="m-t-10px"
+      theme="primary"
+      @click="handleAdd"
+    >
       <template #icon><svg-icon name="add-circle" color="#fff" /></template>
       添加
     </t-button>
 
     <!-- EditColumnDialog -->
     <edit-column-dialog
+      v-if="!readonly"
       v-model:visible="showEditColumnDialog"
       :curRow="curRow"
       :isOutType="isOutType"