Merge branch '20240109-yw' into 20245024-wz

# Conflicts:
#	package.json

.env.development

@@ -5,7 +5,7 @@ VUE_APP_TITLE = UDI追溯监管平台
 ENV = 'development'
 
 # VUE_APP_BASE_API = 'https://ts.udims.com/api/'
-VUE_APP_BASE_API = 'http://127.0.0.1:9002'
+VUE_APP_BASE_API = 'http://192.168.0.166:9002'
 
 # 应用访问路径 例如使用前缀 /admin/
 VUE_APP_CONTEXT_PATH = '/'

.env.production

@@ -10,7 +10,11 @@ ENV = 'production'
 
 
 # 线上
-VUE_APP_BASE_API = 'https://ts.udims.com/api/'
+VUE_APP_BASE_API = 'http://139.159.224.202/api'
+# VUE_APP_BASE_API = 'http://192.168.66.133/api'
+
+
+
 # VUE_APP_BASE_API = 'http://192.168.0.166:9150/UDI_CPT_SERVER/'
 
 # 应用访问路径 例如使用前缀 /admin/

package.json

@@ -37,16 +37,12 @@
     "url": "https://gitee.com/y_project/RuoYi-Vue.git"
   },
   "dependencies": {
-    "@antv/l7plot": "^0.5.11",
-    "@jiaminghi/data-view": "^2.10.0",
+    "element-china-area-data": "^5.0.2",
     "@riophae/vue-treeselect": "0.4.0",
-    "@tinymce/tinymce-vue": "3.0.1",
-    "api": "^6.1.2",
     "axios": "0.24.0",
     "clipboard": "2.0.8",
     "core-js": "3.19.1",
-    "echarts": "^5.5.1",
-    "element-china-area-data": "^5.0.2",
+    "echarts": "4.9.0",
     "element-ui": "2.15.8",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
@@ -60,16 +56,16 @@
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
-    "tinymce": "^6.2.0",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
     "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
-    "vue-seamless-scroll": "^1.1.23",
     "vue2-verify": "^1.1.5",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0"
+    "vuex": "3.6.0",
+    "@tinymce/tinymce-vue": "3.0.1",
+    "tinymce": "^6.2.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",

src/api/ud/ud.js

@@ -0,0 +1,49 @@
+import axios from "@/utils/request";
+
+export function listUd(query) {
+  return axios({
+    url: "/ud/info/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function saveUd(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/ud/info/save"
+      : "/ud/info/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deleteUd(data) {
+  return axios({
+    url: "/ud/info/delete",
+    method: "post",
+    data: data
+  });
+}
+
+export function checkUd(data) {
+  return axios({
+    url: "/ud/info/check",
+    method: "post",
+    data: data
+  });
+}
+
+export function allocateUd(data) {
+  return axios({
+    url: "/ud/info/allocate",
+    method: "post",
+    data: data
+  });
+}
+

src/api/ud/udPlan.js

@@ -0,0 +1,41 @@
+import axios from "@/utils/request";
+
+export function listPlan(query) {
+  return axios({
+    url: "/ud/plan/list",
+    method: "get",
+    params: query
+  });
+}
+
+
+// 保存
+export function savePlan(data, formName, method = "post") {
+  let url =
+    formName !== "edit"
+      ? "/ud/plan/save"
+      : "/ud/plan/edit";
+  return axios({
+    url: url,
+    method: method,
+    data: data
+  });
+}
+
+// 删除
+export function deletePlan(data) {
+  return axios({
+    url: "/ud/plan/delete",
+    method: "post",
+    data: data
+  });
+}
+
+
+export function updateStatusPlan(data) {
+  return axios({
+    url: "/ud/plan/updateStatus",
+    method: "post",
+    data: data
+  });
+}

src/utils/SoftKey.js

@@ -0,0 +1,331 @@
+// JScript source code
+export default class SoftKey
+{
+    constructor() {
+    }
+
+
+StrEnc = function(InString, Key)
+{
+        var n;var m;
+        var nlen;
+
+        var b=Buffer.from(InString);
+        var zero_buf = Buffer.from([0]);
+        b = Buffer.concat([b,zero_buf]);
+        nlen=b.length;
+        if( b.length < 8)
+        {
+            nlen= 8;
+        }
+
+        var outb=Buffer.alloc(nlen);
+        var inb=Buffer.alloc(nlen);
+        b.copy(inb);//如果少于8，则会补0，这里主要是用于补0
+        b.copy(outb);
+
+
+        for(n=0;n<=(nlen-8);n=n+8)
+        {
+            var tmpoutb = this.sub_EnCode(inb,n,Key);
+            for(m=0;m<8;m++)
+            {
+                outb[m+n]=tmpoutb[m];
+            }
+        }
+
+        return outb.toString('hex');
+}
+
+StrDec = function( InString,  Key)//
+{
+    var n,m;
+    var inb=new Buffer(InString, 'hex');
+    var outb=Buffer.alloc(inb.length );
+    inb.copy(outb);
+
+    for( n = 0; n<=inb.length - 8 ;n=n+ 8)
+    {
+        var tmpoutb =this.sub_DeCode(inb,n,Key);
+        for(m=0;m<8;m++)
+        {
+            outb[m+n]=tmpoutb[m];
+        }
+    }
+
+    return  outb.toString();
+}
+
+EnCode = function(inb,Key)
+{
+    this.sub_EnCode(inb,0,Key);
+}
+
+sub_EnCode = function(inb,pos,Key )
+{
+        var cnDelta, y, z, a, b, c, d;
+        var outb=new Uint8Array(8);
+        var n, i, nlen;
+        var sum;
+        var temp, temp_1;
+
+        var buf = new Array(16);
+        var temp_string;
+
+        cnDelta = 2654435769;
+        sum = 0;
+
+        nlen = Key.length ;
+        i = 0;
+        for (n = 1; n <= nlen; n = n + 2)
+        {
+            temp_string= Key.substring(n-1, n-1+2);
+            buf[i] = this.HexToInt(temp_string);
+            i = i + 1;
+        }
+        a = 0; b = 0; c = 0; d = 0;
+        for (n = 0; n <= 3; n++)
+        {
+            a = (buf[n] << (n * 8)) | a;
+            b = (buf[n + 4] << (n * 8)) | b;
+            c = (buf[n + 4 + 4] << (n * 8)) | c;
+            d = (buf[n + 4 + 4 + 4] << (n * 8)) | d;
+        }
+
+        y = 0;
+        z = 0;
+        for (n = 0; n <= 3; n++)
+        {
+            y = (inb[n + pos] << (n * 8)) | y;
+            z = (inb[n + 4 + pos]<< (n * 8)) | z;
+        }
+
+        n = 32;
+
+        while (n > 0)
+        {
+            sum = cnDelta + sum;
+
+            temp = (z << 4) & 0xFFFFFFFF;
+
+            temp = (temp + a) & 0xFFFFFFFF;
+            temp_1 = (z + sum) & 0xFFFFFFFF;
+            temp = (temp ^ temp_1) & 0xFFFFFFFF;
+            temp_1 = (z >>>5) & 0xFFFFFFFF;
+            temp_1 = (temp_1 + b) & 0xFFFFFFFF;
+            temp = (temp ^ temp_1) & 0xFFFFFFFF;
+            temp = (temp + y) & 0xFFFFFFFF;
+            y = temp & 0xFFFFFFFF;
+           // y += ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
+
+            temp = (y << 4) & 0xFFFFFFFF;
+            temp = (temp + c) & 0xFFFFFFFF;
+            temp_1 = (y + sum) & 0xFFFFFFFF;
+            temp = (temp ^ temp_1) & 0xFFFFFFFF;
+            temp_1 = (y >>> 5) & 0xFFFFFFFF;
+            temp_1 = (temp_1 + d) & 0xFFFFFFFF;
+            temp = (temp ^ temp_1) & 0xFFFFFFFF;
+            temp = (z + temp) & 0xFFFFFFFF;
+            z = temp & 0xFFFFFFFF;
+          //  z += ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
+
+            n = n - 1;
+
+        }
+
+        for (n = 0; n <= 3; n++)
+        {
+            outb[n] = ((y >>> (n * 8)) & 255);
+            outb[n + 4] = ((z >>> (n * 8)) & 255);
+        }
+        return outb;
+
+}
+
+DeCode = function()
+{
+    sub_DeCode(inb,0,Key );
+}
+
+ sub_DeCode = function(inb,pos,Key )
+{
+        var cnDelta, y, z, a, b, c, d;
+        var outb=new Uint8Array(8);
+        var n, i, nlen;
+        var sum;
+        var temp, temp_1;
+
+        var buf = new Array(16);
+        var temp_string;
+
+        cnDelta = 2654435769;
+        sum = 3337565984;
+
+        nlen = Key.length ;
+        i = 0;
+        for (n = 1; n <= nlen; n = n + 2)
+        {
+            temp_string= Key.substring(n-1, n-1+2);
+            buf[i] = this.HexToInt(temp_string);
+            i = i + 1;
+        }
+        a = 0; b = 0; c = 0; d = 0;
+        for (n = 0; n <= 3; n++)
+        {
+            a = (buf[n] << (n * 8)) | a;
+            b = (buf[n + 4] << (n * 8)) | b;
+            c = (buf[n + 4 + 4] << (n * 8)) | c;
+            d = (buf[n + 4 + 4 + 4] << (n * 8)) | d;
+        }
+
+        y = 0;
+        z = 0;
+        for (n = 0; n <= 3; n++)
+        {
+            y = (inb[n + pos] << (n * 8)) | y;
+            z = (inb[n + 4 + pos]<< (n * 8)) | z;
+        }
+
+        n = 32;
+
+        while (n > 0)
+        {
+
+             temp = (y << 4) & 0xFFFFFFFF;
+            temp = (temp + c) & 0xFFFFFFFF;
+            temp_1 = (y + sum) & 0xFFFFFFFF;
+            temp = (temp ^ temp_1) & 0xFFFFFFFF;
+            temp_1 = (y >>> 5) & 0xFFFFFFFF;
+            temp_1 = (temp_1 + d) & 0xFFFFFFFF;
+            temp = (temp ^ temp_1) & 0xFFFFFFFF;
+            temp = (z - temp) & 0xFFFFFFFF;
+            z = temp & 0xFFFFFFFF;
+          //  z += ((y << 4) + c) ^ (y + sum) ^ ((y >> 5) + d);
+
+            temp = (z << 4) & 0xFFFFFFFF;
+            temp = (temp + a) & 0xFFFFFFFF;
+            temp_1 = (z + sum) & 0xFFFFFFFF;
+            temp = (temp ^ temp_1) & 0xFFFFFFFF;
+            temp_1 = (z >>>5) & 0xFFFFFFFF;
+            temp_1 = (temp_1 + b) & 0xFFFFFFFF;
+            temp = (temp ^ temp_1) & 0xFFFFFFFF;
+            temp = ( y -temp) & 0xFFFFFFFF;
+            y = temp & 0xFFFFFFFF;
+           // y += ((z << 4) + a) ^ (z + sum) ^ ((z >> 5) + b);
+
+
+
+            sum = sum-cnDelta;
+            n = n - 1;
+
+        }
+
+        for (n = 0; n <= 3; n++)
+        {
+            outb[n] = ((y >>> (n * 8)) & 255);
+            outb[n + 4] = ((z >>> (n * 8)) & 255);
+        }
+        return outb;
+
+}
+
+ /////////////////////
+AddZero = function( InKey)
+{
+    var nlen;
+    var n;
+    nlen =InKey.length;
+    for(n=nlen;n<=7;n++)
+    {
+        InKey = "0" + InKey;
+    }
+    return  InKey;
+}
+
+myconvert = function( HKey,  LKey)
+{
+    HKey = this.AddZero(HKey);
+    LKey = this.AddZero(LKey);
+    var out_data=new Uint8Array(8)
+    var n;
+    for(n=0;n<=3;n++)
+    {
+        out_data[n] = this.HexToInt(HKey.substring(  n * 2, n * 2+2));
+    }
+    for(n=0;n<=3;n++)
+    {
+        out_data[n + 4] = this.HexToInt(LKey.substring( n * 2, n * 2+2));
+    }
+    return out_data;
+}
+
+////bin2hex  & hex2bin
+   ByteArrayToHexString = function(Inb,len)
+   {
+        var outstring= "";
+        for (var n = 0 ;n<= len - 1;n++)
+        {
+            outstring= outstring+this.myhex(Inb[n]) ;
+        }
+        return outstring;
+   }
+
+HexStringToByteArray = function(InString)
+    {
+         var nlen;
+         var retutn_len;
+         var n,i;
+         var b;
+         var temp;
+         nlen = InString.length;
+         if (nlen < 16) retutn_len = 16;
+         retutn_len = nlen / 2;
+         b = new Uint8Array(retutn_len);
+         i = 0;
+         for(n=0;n<nlen;n=n+2)
+         {
+             temp = InString.substring( n, n+2);
+             b[i] = this.HexToInt(temp);
+             i = i + 1;
+          }
+          return b;
+     }
+ ////////
+
+
+//decimal to hex && hex2dec
+   myhex = function(value) {
+    if (value < 16)
+      return '0' + value.toString(16);
+    return value.toString(16);
+    };
+
+
+    HexToInt = function( s)
+    {
+        var hexch ="0123456789ABCDEF";
+        var i, j;
+        var r, n, k;
+        var ch;
+        s=s.toUpperCase();
+
+        k = 1; r = 0;
+        for (i = s.length; i > 0; i--)
+        {
+            ch = s.substring(i - 1,  i-1+1);
+            n = 0;
+            for (j = 0; j < 16; j++)
+            {
+                if (ch == hexch.substring(j, j+1) )
+                {
+                    n = j;
+                }
+            }
+            r += (n * k);
+            k *= 16;
+        }
+        return r;
+    };
+
+
+}

src/utils/UsbKey3A/sm3/sm3-babel.js

@@ -0,0 +1,246 @@
+'use strict';
+
+// 左补0到指定长度
+function leftPad(str, totalLength) {
+  var len = str.length;
+  return Array(totalLength > len ? totalLength - len + 1 : 0).join(0) + str;
+}
+
+// 二进制转化为十六进制
+function binary2hex(binary) {
+  var binaryLength = 8;
+  var hex = '';
+  for (var i = 0; i < binary.length / binaryLength; i += 1) {
+    hex += leftPad(parseInt(binary.substr(i * binaryLength, binaryLength), 2).toString(16), 2);
+  }
+  return hex;
+}
+
+// 十六进制转化为二进制
+function hex2binary(hex) {
+  var hexLength = 2;
+  var binary = '';
+  for (var i = 0; i < hex.length / hexLength; i += 1) {
+    binary += leftPad(parseInt(hex.substr(i * hexLength, hexLength), 16).toString(2), 8);
+  }
+  return binary;
+}
+
+// 普通字符串转化为二进制
+function str2binary(str) {
+  var binary = '';
+  var _iteratorNormalCompletion = true;
+  var _didIteratorError = false;
+  var _iteratorError = undefined;
+
+  try {
+    for (var _iterator = str[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+      var ch = _step.value;
+
+      binary += leftPad(ch.codePointAt(0).toString(2), 8);
+    }
+  } catch (err) {
+    _didIteratorError = true;
+    _iteratorError = err;
+  } finally {
+    try {
+      if (!_iteratorNormalCompletion && _iterator.return) {
+        _iterator.return();
+      }
+    } finally {
+      if (_didIteratorError) {
+        throw _iteratorError;
+      }
+    }
+  }
+
+  return binary;
+}
+
+// 循环左移
+function rol(str, n) {
+  return str.substring(n % str.length) + str.substr(0, n % str.length);
+}
+
+// 二进制运算
+function binaryCal(x, y, method) {
+  var a = x || '';
+  var b = y || '';
+  var result = [];
+  var prevResult = void 0;
+  // for (let i = 0; i < a.length; i += 1) { // 小端
+  for (var i = a.length - 1; i >= 0; i -= 1) {
+    // 大端
+    prevResult = method(a[i], b[i], prevResult);
+    result[i] = prevResult[0];
+  }
+  // console.log(`x     :${x}\ny     :${y}\nresult:${result.join('')}\n`);
+  return result.join('');
+}
+
+// 二进制异或运算
+function xor(x, y) {
+  return binaryCal(x, y, function (a, b) {
+    return [a === b ? '0' : '1'];
+  });
+}
+
+// 二进制与运算
+function and(x, y) {
+  return binaryCal(x, y, function (a, b) {
+    return [a === '1' && b === '1' ? '1' : '0'];
+  });
+}
+
+// 二进制或运算
+function or(x, y) {
+  return binaryCal(x, y, function (a, b) {
+    return [a === '1' || b === '1' ? '1' : '0'];
+  }); // a === '0' && b === '0' ? '0' : '1'
+}
+
+// 二进制与运算
+function add(x, y) {
+  var result = binaryCal(x, y, function (a, b, prevResult) {
+    var carry = prevResult ? prevResult[1] : '0' || '0';
+    if (a !== b) return [carry === '0' ? '1' : '0', carry]; // a,b不等时,carry不变，结果与carry相反
+    // a,b相等时，结果等于原carry，新carry等于a
+    return [carry, a];
+  });
+  // console.log('x: ' + x + '\ny: ' + y + '\n=  ' + result + '\n');
+  return result;
+}
+
+// 二进制非运算
+function not(x) {
+  return binaryCal(x, undefined, function (a) {
+    return [a === '1' ? '0' : '1'];
+  });
+}
+
+function calMulti(method) {
+  return function () {
+    for (var _len = arguments.length, arr = Array(_len), _key = 0; _key < _len; _key++) {
+      arr[_key] = arguments[_key];
+    }
+
+    return arr.reduce(function (prev, curr) {
+      return method(prev, curr);
+    });
+  };
+}
+
+// function xorMulti(...arr) {
+//   return arr.reduce((prev, curr) => xor(prev, curr));
+// }
+
+// 压缩函数中的置换函数 P1(X) = X xor (X <<< 9) xor (X <<< 17)
+function P0(X) {
+  return calMulti(xor)(X, rol(X, 9), rol(X, 17));
+}
+
+// 消息扩展中的置换函数 P1(X) = X xor (X <<< 15) xor (X <<< 23)
+function P1(X) {
+  return calMulti(xor)(X, rol(X, 15), rol(X, 23));
+}
+
+// 布尔函数，随j的变化取不同的表达式
+function FF(X, Y, Z, j) {
+  return j >= 0 && j <= 15 ? calMulti(xor)(X, Y, Z) : calMulti(or)(and(X, Y), and(X, Z), and(Y, Z));
+}
+
+// 布尔函数，随j的变化取不同的表达式
+function GG(X, Y, Z, j) {
+  return j >= 0 && j <= 15 ? calMulti(xor)(X, Y, Z) : or(and(X, Y), and(not(X), Z));
+}
+
+// 常量，随j的变化取不同的值
+function T(j) {
+  return j >= 0 && j <= 15 ? hex2binary('79cc4519') : hex2binary('7a879d8a');
+}
+
+// 压缩函数
+function CF(V, Bi) {
+  // 消息扩展
+  var wordLength = 32;
+  var W = [];
+  var M = []; // W'
+
+  // 将消息分组B划分为16个字W0， W1，…… ，W15 （字为长度为32的比特串）
+  for (var i = 0; i < 16; i += 1) {
+    W.push(Bi.substr(i * wordLength, wordLength));
+  }
+
+  // W[j] <- P1(W[j−16] xor W[j−9] xor (W[j−3] <<< 15)) xor (W[j−13] <<< 7) xor W[j−6]
+  for (var j = 16; j < 68; j += 1) {
+    W.push(calMulti(xor)(P1(calMulti(xor)(W[j - 16], W[j - 9], rol(W[j - 3], 15))), rol(W[j - 13], 7), W[j - 6]));
+  }
+
+  // W′[j] = W[j] xor W[j+4]
+  for (var _j = 0; _j < 64; _j += 1) {
+    M.push(xor(W[_j], W[_j + 4]));
+  }
+
+  // 压缩
+  var wordRegister = []; // 字寄存器
+  for (var _j2 = 0; _j2 < 8; _j2 += 1) {
+    wordRegister.push(V.substr(_j2 * wordLength, wordLength));
+  }
+
+  var A = wordRegister[0];
+  var B = wordRegister[1];
+  var C = wordRegister[2];
+  var D = wordRegister[3];
+  var E = wordRegister[4];
+  var F = wordRegister[5];
+  var G = wordRegister[6];
+  var H = wordRegister[7];
+
+  // 中间变量
+  var SS1 = void 0;
+  var SS2 = void 0;
+  var TT1 = void 0;
+  var TT2 = void 0;
+  for (var _j3 = 0; _j3 < 64; _j3 += 1) {
+    SS1 = rol(calMulti(add)(rol(A, 12), E, rol(T(_j3), _j3)), 7);
+    SS2 = xor(SS1, rol(A, 12));
+
+    TT1 = calMulti(add)(FF(A, B, C, _j3), D, SS2, M[_j3]);
+    TT2 = calMulti(add)(GG(E, F, G, _j3), H, SS1, W[_j3]);
+
+    D = C;
+    C = rol(B, 9);
+    B = A;
+    A = TT1;
+    H = G;
+    G = rol(F, 19);
+    F = E;
+    E = P0(TT2);
+  }
+
+  return xor(Array(A, B, C, D, E, F, G, H).join(''), V);
+}
+
+// sm3 hash算法 http://www.oscca.gov.cn/News/201012/News_1199.htm
+function sm3(str) {
+  var binary = str2binary(str);
+  // 填充
+  var len = binary.length;
+  // k是满足len + 1 + k = 448mod512的最小的非负整数
+  var k = len % 512;
+  // 如果 448 <= (512 % len) < 512，需要多补充 (len % 448) 比特'0'以满足总比特长度为512的倍数
+  k = k >= 448 ? 512 - (k % 448) - 1: 448 - k - 1;
+  var m = (binary + '1' + leftPad('', k) + leftPad(len.toString(2), 64)).toString(); // k个0
+
+  // 迭代压缩
+  var n = (len + k + 65) / 512;
+
+  var V = hex2binary('7380166f4914b2b9172442d7da8a0600a96f30bc163138aae38dee4db0fb0e4e');
+  for (var i = 0; i <= n - 1; i += 1) {
+    var B = m.substr(512 * i, 512);
+    V = CF(V, B);
+  }
+  return binary2hex(V);
+}
+
+module.exports = sm3;

src/utils/UsbKey3A/sm3/sm3.js

@@ -0,0 +1,223 @@
+/*
+ * JavaScript SM3
+ * https://github.com/jiaxingzheng/JavaScript-SM3
+ *
+ * Copyright 2017, Zheng Jiaxing
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ *
+ * Refer to
+ * http://www.oscca.gov.cn/UpFile/20101222141857786.pdf
+ */
+
+
+// 左补0到指定长度
+function leftPad(str, totalLength) {
+  const len = str.length;
+  return Array(totalLength > len ? ((totalLength - len) + 1) : 0).join(0) + str;
+}
+
+// 二进制转化为十六进制
+function binary2hex(binary) {
+  const binaryLength = 8;
+  let hex = '';
+  for (let i = 0; i < binary.length / binaryLength; i += 1) {
+    hex += leftPad(parseInt(binary.substr(i * binaryLength, binaryLength), 2).toString(16), 2);
+  }
+  return hex;
+}
+
+// 十六进制转化为二进制
+function hex2binary(hex) {
+  const hexLength = 2;
+  let binary = '';
+  for (let i = 0; i < hex.length / hexLength; i += 1) {
+    binary += leftPad(parseInt(hex.substr(i * hexLength, hexLength), 16).toString(2), 8);
+  }
+  return binary;
+}
+
+// 普通字符串转化为二进制
+function str2binary(str) {
+  let binary = '';
+  for (const ch of str) {
+    binary += leftPad(ch.codePointAt(0).toString(2), 8);
+  }
+  return binary;
+}
+
+// 循环左移
+function rol(str, n) {
+  return str.substring(n % str.length) + str.substr(0, n % str.length);
+}
+
+// 二进制运算
+function binaryCal(x, y, method) {
+  const a = x || '';
+  const b = y || '';
+  const result = [];
+  let prevResult;
+  // for (let i = 0; i < a.length; i += 1) { // 小端
+  for (let i = a.length - 1; i >= 0; i -= 1) { // 大端
+    prevResult = method(a[i], b[i], prevResult);
+    result[i] = prevResult[0];
+  }
+  // console.log(`x     :${x}\ny     :${y}\nresult:${result.join('')}\n`);
+  return result.join('');
+}
+
+// 二进制异或运算
+function xor(x, y) {
+  return binaryCal(x, y, (a, b) => [(a === b ? '0' : '1')]);
+}
+
+// 二进制与运算
+function and(x, y) {
+  return binaryCal(x, y, (a, b) => [(a === '1' && b === '1' ? '1' : '0')]);
+}
+
+// 二进制或运算
+function or(x, y) {
+  return binaryCal(x, y, (a, b) => [(a === '1' || b === '1' ? '1' : '0')]);// a === '0' && b === '0' ? '0' : '1'
+}
+
+// 二进制与运算
+function add(x, y) {
+  const result = binaryCal(x, y, (a, b, prevResult) => {
+    const carry = prevResult ? prevResult[1] : '0' || '0';
+    if (a !== b) return [carry === '0' ? '1' : '0', carry];// a,b不等时,carry不变，结果与carry相反
+    // a,b相等时，结果等于原carry，新carry等于a
+    return [carry, a];
+  });
+  // console.log('x: ' + x + '\ny: ' + y + '\n=  ' + result + '\n');
+  return result;
+}
+
+// 二进制非运算
+function not(x) {
+  return binaryCal(x, undefined, a => [a === '1' ? '0' : '1']);
+}
+
+function calMulti(method) {
+  return (...arr) => arr.reduce((prev, curr) => method(prev, curr));
+}
+
+// function xorMulti(...arr) {
+//   return arr.reduce((prev, curr) => xor(prev, curr));
+// }
+
+// 压缩函数中的置换函数 P1(X) = X xor (X <<< 9) xor (X <<< 17)
+function P0(X) {
+  return calMulti(xor)(X, rol(X, 9), rol(X, 17));
+}
+
+// 消息扩展中的置换函数 P1(X) = X xor (X <<< 15) xor (X <<< 23)
+function P1(X) {
+  return calMulti(xor)(X, rol(X, 15), rol(X, 23));
+}
+
+// 布尔函数，随j的变化取不同的表达式
+function FF(X, Y, Z, j) {
+  return j >= 0 && j <= 15 ? calMulti(xor)(X, Y, Z) : calMulti(or)(and(X, Y), and(X, Z), and(Y, Z));
+}
+
+// 布尔函数，随j的变化取不同的表达式
+function GG(X, Y, Z, j) {
+  return j >= 0 && j <= 15 ? calMulti(xor)(X, Y, Z) : or(and(X, Y), and(not(X), Z));
+}
+
+// 常量，随j的变化取不同的值
+function T(j) {
+  return j >= 0 && j <= 15 ? hex2binary('79cc4519') : hex2binary('7a879d8a');
+}
+
+// 压缩函数
+function CF(V, Bi) {
+  // 消息扩展
+  const wordLength = 32;
+  const W = [];
+  const M = [];// W'
+
+  // 将消息分组B划分为16个字W0， W1，…… ，W15 （字为长度为32的比特串）
+  for (let i = 0; i < 16; i += 1) {
+    W.push(Bi.substr(i * wordLength, wordLength));
+  }
+
+  // W[j] <- P1(W[j−16] xor W[j−9] xor (W[j−3] <<< 15)) xor (W[j−13] <<< 7) xor W[j−6]
+  for (let j = 16; j < 68; j += 1) {
+    W.push(calMulti(xor)(
+      P1(calMulti(xor)(W[j - 16], W[j - 9], rol(W[j - 3], 15))),
+      rol(W[j - 13], 7),
+      W[j - 6]
+    ));
+  }
+
+  // W′[j] = W[j] xor W[j+4]
+  for (let j = 0; j < 64; j += 1) {
+    M.push(xor(W[j], W[j + 4]));
+  }
+
+  // 压缩
+  const wordRegister = [];// 字寄存器
+  for (let j = 0; j < 8; j += 1) {
+    wordRegister.push(V.substr(j * wordLength, wordLength));
+  }
+
+  let A = wordRegister[0];
+  let B = wordRegister[1];
+  let C = wordRegister[2];
+  let D = wordRegister[3];
+  let E = wordRegister[4];
+  let F = wordRegister[5];
+  let G = wordRegister[6];
+  let H = wordRegister[7];
+
+  // 中间变量
+  let SS1;
+  let SS2;
+  let TT1;
+  let TT2;
+  for (let j = 0; j < 64; j += 1) {
+    SS1 = rol(calMulti(add)(rol(A, 12), E, rol(T(j), j)), 7);
+    SS2 = xor(SS1, rol(A, 12));
+
+    TT1 = calMulti(add)(FF(A, B, C, j), D, SS2, M[j]);
+    TT2 = calMulti(add)(GG(E, F, G, j), H, SS1, W[j]);
+
+    D = C;
+    C = rol(B, 9);
+    B = A;
+    A = TT1;
+    H = G;
+    G = rol(F, 19);
+    F = E;
+    E = P0(TT2);
+  }
+
+  return xor(Array(A, B, C, D, E, F, G, H).join(''), V);
+}
+
+// sm3 hash算法 http://www.oscca.gov.cn/News/201012/News_1199.htm
+export function sm3(str) {
+  const binary = str2binary(str);
+  // 填充
+  const len = binary.length;
+  // k是满足len + 1 + k = 448mod512的最小的非负整数
+  let k = len % 512;
+  // 如果 448 <= (512 % len) < 512，需要多补充 (len % 448) 比特'0'以满足总比特长度为512的倍数
+  k = k >= 448 ? 512 - (k % 448) - 1: 448 - k - 1;
+  const m = `${binary}1${leftPad('', k)}${leftPad(len.toString(2), 64)}`.toString();// k个0
+
+  // 迭代压缩
+  const n = (len + k + 65) / 512;
+
+  let V = hex2binary('7380166f4914b2b9172442d7da8a0600a96f30bc163138aae38dee4db0fb0e4e');
+  for (let i = 0; i <= n - 1; i += 1) {
+    const B = m.substr(512 * i, 512);
+    V = CF(V, B);
+  }
+  return binary2hex(V);
+}
+
+

src/views/basic/client/cert/corpMaintainCert.vue

@@ -1403,7 +1403,7 @@ export default {
     },
     addOrderMutiCert(){
       if (isBlank(this.currentRow.corpId)) {
-        this.$message.error("请先选择用户！")
+        this.$message.error("请先选择往来单位！")
         return;
       }
       this.inputCertQuery={
@@ -1526,7 +1526,7 @@ export default {
     },
     getBizDetailList() {
       if (isBlank(this.currentRow.corpId)) {
-        this.$message.error("请先选择用户！")
+        this.$message.error("请先选择往来单位！")
         return;
       }
       this.bizDetailLoading = true;

src/views/basic/corpMaintain/corpMaintain.vue

@@ -1246,9 +1246,8 @@ export default {
       }
     },
     getBizDetailList() {
-      console.log("hshhhshhshshhshshs")
       if (isBlank(this.currentRow.companyIdFk)) {
-        this.$message.error("请先选择用户！")
+        this.$message.error("请先选择往来单位！")
         return;
       }
       this.bizDetailLoading = true;
@@ -1285,7 +1284,7 @@ export default {
 
     addOrderMutiAuth(){
       if (isBlank(this.currentRow.companyIdFk)) {
-        this.$message.error("请先选择用户！")
+        this.$message.error("请先选择往来单位！")
         return;
       }
       this.inputAuthQuery={
@@ -1295,7 +1294,7 @@ export default {
     },
     addOrderMutiCert(){
       if (isBlank(this.currentRow.companyIdFk)) {
-        this.$message.error("请先选择用户！")
+        this.$message.error("请先选择往来单位！")
         return;
       }
       this.inputCertQuery={
@@ -1386,10 +1385,10 @@ export default {
       this.getList();
     },
     handleSelectionChange(_this,val) {
-      console.log("ddddddddddddddddddddddddddddd",val)
+      // console.log("ddddddddddddddddddddddddddddd",val)
       this.multipleSelection = val;
       if(val){
-        _this.currentRow.companyIdFk = val.id;
+        _this.currentRow.companyIdFk = val.companyIdFk;
         _this.getOrderDetails();
       }
     },
@@ -1529,18 +1528,18 @@ export default {
     if (this.editType == 0) {
       this.inputQuery.manufacturerId = getUUID('')
     } else {
-      this.certQuery.customerId = this.inputQuery.customerId
-      this.selectedOptions = this.inputQuery.placeAreaCode.split(',')
-      if (this.inputQuery.productionAreaCode != '' && this.inputQuery.productionAreaCode != null && this.inputQuery.productionAreaCode != undefined) {
-        this.selectedOptions2 = this.inputQuery.productionAreaCode.split(',')
-      }
+      // this.certQuery.customerId = this.$store.getters.customerId
+      // this.selectedOptions = this.inputQuery.placeAreaCode.split(',')
+      // if (this.inputQuery.productionAreaCode != '' && this.inputQuery.productionAreaCode != null && this.inputQuery.productionAreaCode != undefined) {
+      //   this.selectedOptions2 = this.inputQuery.productionAreaCode.split(',')
+      // }
 
     }
-    this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId
-    this.manufacturerId = this.inputQuery.manufacturerId
-    this.customerId = this.inputQuery.customerId
+    // this.certQuery.manufacturerIdFk = this.inputQuery.manufacturerId
+    // this.manufacturerId = this.inputQuery.manufacturerId
+    // this.customerId = this.$store.getters.customerId
     // this.getData();
-    this.getCompanyCertList()
+    // this.getCompanyCertList()
     this.findMethod()
     this.uploadUrl = this.BASE_URL + '/udiwms/upload/register/file'
     this.fileUrl = this.BASE_URL + '/udiwms/image/register/file/getImage?type=image2&name='

src/views/myLogin2.vue

@@ -0,0 +1,244 @@
+<template>
+  <div align="center">
+    <br />
+    <br />
+    要测试的话，无需输入任何数据，直接点提交就可以自动获到锁的信息<br />
+    <br />
+    <input name="KeyID" type="text" id="KeyID" size="20" />
+    <input name="UserName" type="text" id="UserName" size="20" />
+    <input name="Password" type="text" id="Password" size="20" />
+    <input name="rnd" type="text" id="rnd" v-model="myrnd"  />
+    <input name="return_EncData" type="text" id="return_EncData" value=""   />
+    <button v-on:click="login_onclick">提交</button>
+    <br /> <br />
+    <input name="IDInfo" type="text" id="IDInfo" v-model="IDInfo"  />
+    <br /> <br />
+    <input name="UserNameInfo" type="text" id="UserNameInfo" v-model="UserNameInfo"  />
+    <br /> <br />
+    <input name="PasswordInfo" type="text" id="PasswordInfo" v-model="PasswordInfo"  />
+    <br /> <br />
+    <input name="strDataInfo" type="text" id="strDataInfo" v-model="strDataInfo"  />
+    <br /> <br />
+    <input name="EncResultInfo" type="text" id="EncResultInfo" v-model="EncResultInfo"  />
+    <br /> <br />
+    <input name="Msg" type="text" id="Msg" v-model="Msg"  />
+    <br /> <br />
+  </div>
+</template>
+
+<script>
+import SoftKey3W from '@/utils//Syunew3W.js'
+import SoftKey from '@/utils//SoftKey.js'
+
+function GetRandomNum(Min,Max)
+{
+  var Range = Max - Min;
+  var Rand = Math.random();
+  return(Min + Math.round(Rand * Range)).toString();
+}
+
+function myonLoad()
+{
+  try
+  {
+    var s_pnp=new SoftKey3W();
+    s_pnp.Socket_UK.onopen = function()
+    {
+
+    }
+
+    //在使用事件插拨时，注意，一定不要关掉Sockey，否则无法监测事件插拨
+    s_pnp.Socket_UK.onmessage =function got_packet(Msg)
+    {
+      var PnpData = JSON.parse(Msg.data);
+      if(PnpData.type=="PnpEvent")//如果是插拨事件处理消息
+      {
+        if(PnpData.IsIn)
+        {
+          alert("UKEY已被插入，被插入的锁的路径是："+PnpData.DevicePath);
+        }
+        else
+        {
+          alert("UKEY已被拨出，被拨出的锁的路径是："+PnpData.DevicePath);
+        }
+      }
+    }
+
+    s_pnp.Socket_UK.onclose = function()
+    {
+
+    }
+  }
+  catch(e)
+  {
+    alert(e.name + ": " + e.message);
+    return false;
+  }
+}
+
+var digitArray = new Array('0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f');
+
+function toHex( n ) {
+
+  var result = ''
+  var start = true;
+
+  for ( var i=32; i>0; ) {
+    i -= 4;
+    var digit = ( n >> i ) & 0xf;
+
+    if (!start || digit != 0) {
+      start = false;
+      result += digitArray[digit];
+    }
+  }
+
+  return ( result == '' ? '0' : result );
+}
+
+
+export default {
+  UserName:"",
+  Password:"",
+  return_EncData:"",
+  KeyID:"",
+  myrnd:"",
+  IDInfo:"",
+  UserNameInfo:"",
+  PasswordInfo:"",
+  strDataInfo:"",
+  Msg:"",
+  EncResultInfo:"",
+  strData:"",
+  data () {
+    return {
+      myrnd: '',
+      Msg:"",
+    }
+  },
+  mounted()
+  {
+    this.myrnd= GetRandomNum(1,65535)+GetRandomNum(1,65535);//赋值随机数，以实现一次一密
+    this.strData=this.myrnd
+    myonLoad();
+  },
+  methods:{
+    login_onclick:async function(){//这里使用了异步的方式，因为WEBSOCKET是异步的
+
+      await this.mylogin_onclick(this)//这里等客户关提交结果，使用了await异步等的方式，因为WEBSOCKET是异步的
+
+      //输出信息：
+      this.IDInfo="UKEY的ID是："+this.KeyID;
+      this.UserNameInfo="从UKEY中获取到的用户名是："+this.UserName;
+      this.PasswordInfo="从UKEY中获取到的用户密码是："+this.Password;
+      //以下是用增强算法（TEA）对随机数进行加密验证
+      var Key;
+      //Key：即增强算法密钥，这个要与设置在加密锁中的密钥一致
+      //增强算法密钥可以是每一把都不相同，也可以是都相同，如果是不相同的可以根据用户名在从数据库中获取对应的增强算法密钥，可以根据安全性及自身具体情况而定，这里使用了一个固定的值
+      Key="1234567890ABCDEF1234567890ABCDEF1111";
+
+      var mSoftKey=new SoftKey(); //创建增强算法类
+      //strData：要进行加密的数据,
+      this.strDataInfo= "服务器运算的随机数是："+this.strData;
+      //在服务器端对数据进行加密运算
+      var m_StrEnc = mSoftKey.StrEnc(this.strData,Key);//注意， 这里不要对提交过来的随机数this.myrnd进行加密，因为提交的数据可能被非法更改
+      console.log(m_StrEnc);
+      this.EncResultInfo="服务器运算的结果是："+m_StrEnc;
+      //比较客户端加密锁返回的加密结果与服务端的加密结果是否相符，如果相符就认为是合法用户，由于使用了随机数，从而实现了一次一密的高安全性，可以用于高安全性的身份验证
+      if (m_StrEnc.trim().toLocaleUpperCase==this.return_EncData.trim().toLocaleUpperCase)
+      {
+        this.Msg= "该用户是合法用户";
+      }
+      else
+      {
+        this.Msg= "该用户不是合法用户";
+      }
+    },
+    mylogin_onclick:async function(InThis)
+    {
+      var DevicePath
+      var that=InThis;
+      var ret, version, versionex
+      var mSoftKey3A = new SoftKey3W();//注意，由于USB的操作是异步的，所以所有函数的调用前必须加await !!!!!!!!!
+      DevicePath = await mSoftKey3A.FindPort(1);//'查找是否存在多把加密锁
+      if (mSoftKey3A.GetLastError() == 0) {
+        window.alert("系统上发现有2把及以上的加密锁，请只插入要进行的加密锁。"); return false;
+      }
+      DevicePath = await mSoftKey3A.FindPort(0);//'查找是否存在加密锁
+      if (mSoftKey3A.GetLastError() != 0) {
+        window.alert("未发现加密锁，请插入加密锁"); return false;
+      }
+
+      //读取加密锁的芯片唯一ID，某些旧的型号可能没有芯片唯一ID，可以用加密狗ID
+      {
+        that.KeyID = await mSoftKey3A.GetChipID(DevicePath);
+        if (mSoftKey3A.GetLastError() != 0) {
+          //某些旧的型号可能没有芯片唯一ID，可以用加密狗ID
+          that.KeyID = toHex(await mSoftKey3A.GetID_1(DevicePath)) + toHex(await mSoftKey3A.GetID_2(DevicePath));
+          if (mSoftKey3A.GetLastError() != 0) {
+            window.alert("获取ID错误,错误码是" + mSoftKey3A.GetLastError().toString());
+            return false;
+          }
+        }
+      }
+
+      var addr
+      //储存在加密锁的用户名
+      {
+        addr = 0//用户名储存在0开如的地址中，之前要用我们的设用户名及密码工具设置
+        //先从地址0读取字符串的长度,使用默认的读密码"FFFFFFFF","FFFFFFFF"
+        var OutLenBuf = await mSoftKey3A.YReadEx(addr, 1, "test", "123456", DevicePath);
+        var nlen = OutLenBuf[0];
+        if (mSoftKey3A.GetLastError() != 0) {
+          window.alert("读取用户名长度时错误。错误码：" + mSoftKey3A.GetLastError().toString()); return false;
+        }
+        //再从地址1读取相应的长度的字符串，,使用默认的读密码"FFFFFFFF","FFFFFFFF"
+        that.UserName = await mSoftKey3A.YReadString(addr + 1, nlen, "test", "123456", DevicePath);
+        if (mSoftKey3A.GetLastError() != 0) {
+          window.alert("读取用户名时错误。错误码：" + mSoftKey3A.GetLastError().toString()); return false;
+        }
+      }
+      //储存在加密锁的用户密码，与上面的区别在于地址不一样，
+      {
+        addr = 20//用户密码储存在0开如的地址中，之前要用我们的设用户名及密码工具设置
+        //先从地址0读取字符串的长度,使用默认的读密码"FFFFFFFF","FFFFFFFF"
+        var OutLenBuf = await mSoftKey3A.YReadEx(addr, 1, "test", "123456", DevicePath);
+        var nlen = OutLenBuf[0];
+        if (mSoftKey3A.GetLastError() != 0) {
+          window.alert("读取用户密码长度时错误。错误码：" + mSoftKey3A.GetLastError().toString()); return false;
+        }
+        //再从地址1读取相应的长度的字符串，,使用默认的读密码"FFFFFFFF","FFFFFFFF"
+        that.Password = await mSoftKey3A.YReadString(addr + 1, nlen, "test", "123456", DevicePath);
+        if (mSoftKey3A.GetLastError() != 0) {
+          window.alert("读取用户密码时错误。错误码：" + mSoftKey3A.GetLastError().toString()); return false;
+        }
+      }
+      //这里返回对随机数的HASH结果
+      that.return_EncData = await mSoftKey3A.EncString(that.myrnd, DevicePath);
+      console.log(that.return_EncData);
+      if (mSoftKey3A.GetLastError() != 0) {
+        window.alert("进行加密运行算时错误，错误码为：" + mSoftKey3A.GetLastError().toString());
+        return false;
+      }
+    }
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+h1, h2 {
+  font-weight: normal;
+}
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+a {
+  color: #42b983;
+}
+</style>

src/views/purchase/cert/supCertAddDialog.vue

@@ -272,7 +272,7 @@ export default {
       } else if (this.addType == 3) {
         this.formData.manufacturerIdFk = this.inputQuery.manufacturerIdFk;
         this.formData.productIdFk = this.inputQuery.productId;
-      }else if (this.addType==4){
+      } else if (this.addType == 4) {
         this.formData.companyIdFk = this.inputQuery.companyIdFk;
         console.log(this.inputQuery.companyIdFk);
       }
@@ -379,9 +379,9 @@ export default {
     };
     console.log("到富文本框啦");
     console.log(this.inputQuery)
-    if (this.inputQuery.type==4){
+    if (this.inputQuery.type == 4) {
       this.formData = this.inputQuery;
-    }else {
+    } else {
       if (this.inputQuery.formData == null) {
         this.formData = {}
       } else if (this.inputQuery.formData != null && this.inputQuery.formData.addType == 1) {
@@ -391,7 +391,7 @@ export default {
         console.log(this.inputQuery.formData);
       }
     }
-    console.log("66"+this.inputQuery.formData);
+    console.log("66" + this.inputQuery.formData);
     if (this.formData.filePath != null) {
       this.choiceFile = "更换文件";
       this.isCleck = true;

src/views/ud/ud.vue

@@ -0,0 +1,827 @@
+<script src="../../permission.js"></script>
+<template>
+  <div>
+    <el-card>
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch" :inline="true">
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+                :autosize="{ minRows: 4, maxRows: 9}"
+              ></el-input>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'actDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePicker' && item.columnName == 'auditDateRange' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="auditDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
+            </el-form-item>
+          </template>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-plus" @click="(event) => addOrderMuti()">新增订单</el-button>
+        </el-button-group>
+      </div>
+      <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row
+                @row-click="(row) => executeFuc(row,'0',tableObj.handleChangeFuc)">
+      >
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+
+      ></pagination>
+    </el-card>
+
+
+    <el-card class="el-card">
+      <el-form v-if="queryList2 && queryList2.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch" :inline="true">
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList2" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterInfoQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+                :autosize="{ minRows: 4, maxRows: 9}"
+              ></el-input>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="filterInfoQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select
+                v-model="filterInfoQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterInfoQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
+            </el-form-item>
+          </template>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onInfoReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onInfoSubmit"
+          >查询
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-plus" @click="(event) => addInfoMuti()">新增U盾</el-button>
+        </el-button-group>
+      </div>
+      <el-divider style="margin: 15px"></el-divider>
+      <el-table v-loading="loadInfoLoading" :data="manuInfoList" style="width: 100%" ref="table"
+                highlight-current-row border >
+        <template v-for="(item, index) in tableHeader2">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+
+        </template>
+      </el-table>
+
+      <pagination
+        v-show="manuInfoTotal>0"
+        :total="manuInfoTotal"
+        :page.sync="filterInfoQuery.page"
+        :limit.sync="filterInfoQuery.limit"
+        @pagination="handleInfoChange"
+
+      ></pagination>
+
+
+    </el-card>
+
+    <el-dialog
+      :title="formMap[formName]"
+      :visible.sync="orderMutiSetVisible"
+      :before-close="close"
+      width="60%"
+      v-if="orderMutiSetVisible"
+      @close='closeDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <udPlanDialog
+        :closeDialog="closeDialog"
+        :inputQuery="inputQuery"
+        :formName="formName"
+      ></udPlanDialog>
+    </el-dialog>
+
+
+    <el-dialog
+      :title="formInfoMap[formInfoName]"
+      :visible.sync="manuInfoDialogVisible"
+      :before-close="close"
+      width="60%"
+      v-if="manuInfoDialogVisible"
+      @close='closeInfoDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <udInfoDialog
+        :closeDialog="closeInfoDialog"
+        :inputQuery="inputInfoQuery"
+        :formName="formInfoName"
+      ></udInfoDialog>
+    </el-dialog>
+
+    <el-dialog
+      title="设置pin码"
+      :visible.sync="manuPinDialogVisible"
+      :before-close="close"
+      width="60%"
+      v-if="manuPinDialogVisible"
+      @close='closePinDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <udInfoPinDialog
+        :closeDialog="closePinDialog"
+        :inputQuery="inputInfoQuery"
+        formName="设置pin码"
+      ></udInfoPinDialog>
+    </el-dialog>
+
+    <el-dialog
+      title="设置秘钥"
+      :visible.sync="manuKeyDialogVisible"
+      :before-close="close"
+      width="60%"
+      v-if="manuKeyDialogVisible"
+      @close='closeKeyDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <udInfoKeyDialog
+        :closeDialog="closeKeyDialog"
+        :inputQuery="inputInfoQuery"
+        formName="设置秘钥"
+      ></udInfoKeyDialog>
+    </el-dialog>
+  </div>
+</template>
+
+
+
+<script>
+import udInfoDialog from "@/views/ud/udInfoDialog";
+import udInfoKeyDialog from "@/views/ud/udInfoKeyDialog";
+import udInfoPinDialog from "@/views/ud/udInfoPinDialog";
+import udPlanDialog from "@/views/ud/udPlanDialog";
+import {deleteUd, listUd,checkUd} from "@/api/ud/ud";
+import {deletePlan,updateStatusPlan, listPlan} from "@/api/ud/udPlan";
+import {executeFuc, getHead} from "@/utils/customConfig";
+import SoftKey3A from '@/utils/UsbKey3A/SoftKey3A'
+import {isBlank} from "@/utils/strUtil";
+
+export default {
+  name: "ud",
+  data() {
+    return {
+        showSearch: true,
+      filterQuery: {
+        page: 1,
+        limit: 10,
+      },
+      total: 0,
+      loading: false,
+      list: [],
+      formName: 1,
+      formMap: {
+        1: "新增U盾订单",
+        2: "编辑U盾订单",
+      },
+      inputQuery:{},
+      orderMutiSetVisible: false,
+
+      formInfoName: 1,
+      formInfoMap: {
+        1: "新增U盾",
+        2: "编辑U盾",
+      },
+      inputInfoQuery:{},
+      manuInfoDialogVisible: false,
+      manuKeyDialogVisible: false,
+      manuPinDialogVisible: false,
+      manuInfoList: [],
+      loadInfoLoading: false,
+      manuInfoTotal: 0,
+      filterInfoQuery: {
+        page: 1,
+        limit: 10,
+      },
+      changeCode:"",
+      actDateRange: [],
+      auditDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      if (this.auditDateRange !== null) {
+        this.filterQuery.startAduditTime = this.auditDateRange[0];
+        this.filterQuery.endAduditTime = this.auditDateRange[1];
+      } else {
+        this.filterQuery.startAduditTime = null;
+        this.filterQuery.endAduditTime = null;
+      }
+
+      this.filterQuery.page = 1;
+      this.getList();
+      this.changeCode = "";
+      this.manuInfoList = [],
+      this.manuInfoTotal = 0
+    },
+    onInfoSubmit() {
+      this.filterInfoQuery.page = 1;
+      this.getInfoList();
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+      this.changeCode = "";
+      this.actDateRange = [];
+      this.auditDateRange = [];
+      this.manuInfoList = [],
+      this.manuInfoTotal = 0
+    },
+    onInfoReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterInfoQuery = {
+        producePlanId:this.changeCode,
+        page: 1,
+        limit: 10,
+      };
+      this.getInfoList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    handleInfoChange(val) {
+      this.filterInfoQuery.page = val.page;
+    },
+    closeDialog(){
+      this.orderMutiSetVisible = false;
+      this.getList();
+    },
+    addOrderMuti(){
+      this.inputQuery={
+
+      }
+      this.formName=1;
+      this.orderMutiSetVisible = true;
+    },
+    editDialog(_this,row){
+      _this.formName=2;
+      _this.inputQuery=row;
+      _this.orderMutiSetVisible = true;
+    },
+    GetRandomNum(Min,Max){
+      var Range = Max - Min;
+      var Rand = Math.random();
+      return(Min + Math.round(Rand * Range)).toString();
+    },
+    checkInfo:async function(_this,row){
+      if (isBlank(row.privateKey) || isBlank(row.publicKeyX) || isBlank(row.publicKeyY)) {
+        _this.$message.error("秘钥未设置！");
+        return;
+      }
+
+      var DevicePath
+      var mSoftKey3A=new SoftKey3A();//注意，由于USB的操作是异步的，所以所有函数的调用前必须加await !!!!!!!!!
+      DevicePath =await mSoftKey3A.FindPort(1);//'查找是否存在多把加密锁
+      if( mSoftKey3A.GetLastError()== 0 ) {
+        _this.$message.error( "系统上发现有2把及以上的加密锁，请只插入要进行的加密锁。");return false;
+      }
+      DevicePath =await mSoftKey3A.FindPort(0);//'查找是否存在加密锁
+      if( mSoftKey3A.GetLastError()!= 0 ) {
+        _this.$message.error( "未发现加密锁，请插入加密锁");return false;
+      }
+      var data = {
+        randomString:_this.GetRandomNum(1,65535)+_this.GetRandomNum(1,65535),
+        id:row.id,
+        ciphertext:'',
+      }
+
+      data.ciphertext =await mSoftKey3A.YtSign(data.randomString,row.pin,DevicePath);
+      if(!data.ciphertext) {
+        _this.$message.error( "签名失败");return false;
+      }
+      console.log(data)
+      checkUd(data)
+        .then((response) => {
+          if(response.code == 20000){
+            _this.$message.success("校验成功");
+            _this.getInfoList()
+          }else{
+            _this.$message.error("校验失败");
+          }
+        })
+        .catch(() => {
+          _this.$message.error(response.message);
+        });
+    },
+    closeInfoDialog(){
+      this.manuInfoDialogVisible = false;
+      this.getInfoList();
+    },
+    closeKeyDialog(){
+      this.manuKeyDialogVisible = false;
+      this.getInfoList();
+    },
+    closePinDialog(){
+      this.manuPinDialogVisible = false;
+      this.getInfoList();
+    },
+    addInfoMuti(){
+      var changeCode =  this.changeCode;
+      if(!changeCode){
+        this.$message.error("请先选择订单");
+        return;
+      }
+      this.inputInfoQuery={
+        producePlanId:changeCode,
+        uniqueId:'',
+        userName:'',
+      }
+      this.formInfoName=1;
+      this.manuInfoDialogVisible = true;
+    },
+    editInfoDialog(_this,row){
+      _this.formInfoName=2;
+      _this.inputInfoQuery=row;
+      _this.manuInfoDialogVisible = true;
+    },
+    editKeyDialog(_this,row){
+      _this.inputInfoQuery=row;
+      _this.manuKeyDialogVisible = true;
+    },
+    editPinDialog(_this,row){
+      _this.inputInfoQuery=row;
+      _this.manuPinDialogVisible = true;
+    },
+    supPlanClick(_this,row) {
+      _this.changeCode= row.id
+      _this.onInfoReset();
+    },
+    getList() {
+      this.loading = true;
+      listPlan(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+
+    deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
+      deletePlan(row)
+        .then((response) => {
+          if(response.code == 20000){
+            _this.getList()
+          }else{
+            _this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          _this.$message.error(response.message);
+        });
+          });
+    },
+    updateStatus(_this,row) {
+      _this.$confirm("请确认订单是否已完成制作！", "提示", {
+        type: "warning",
+      })
+        .then(() => {
+          updateStatusPlan(row)
+            .then((response) => {
+              if(response.code == 20000){
+                _this.getList()
+              }else{
+                _this.$message.error(response.message);
+              }
+            })
+            .catch(() => {
+              _this.$message.error(response.message);
+            });
+        });
+    },
+
+    getInfoList() {
+      this.loadInfoLoading = true;
+      listUd(this.filterInfoQuery)
+        .then((response) => {
+          this.loadInfoLoading = false;
+          this.manuInfoList = response.data.list || [];
+          this.manuInfoTotal = response.data.total || 0;
+        })
+        .catch(() => {
+          this.filterInfoQuery = false;
+          this.manuInfoList = [];
+          this.manuInfoTotal = 0;
+        });
+    },
+
+    deleteInfoDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
+      deleteUd(row)
+        .then((response) => {
+          if(response.code == 20000){
+            _this.getInfoList()
+          }else{
+            _this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          _this.$message.error(response.message);
+        });
+          });
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  components: {udInfoDialog,udPlanDialog,udInfoKeyDialog,udInfoPinDialog},
+  created() {
+     getHead("ud-plan","1").then((re) => {
+       // 处理返回的数据
+       this.tableObj = re.data;
+       this.tableHeader = re.data.tableList;
+       this.queryList = re.data.queryList;
+       this.fromList = re.data.fromList;
+       this.getList()
+     });
+
+
+    getHead("ud-info","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj2 = re.data;
+      this.tableHeader2 = re.data.tableList;
+      this.queryList2 = re.data.queryList;
+      this.fromList2 = re.data.fromList;
+    });
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ud/udInfoDialog.vue

@@ -0,0 +1,258 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+          <el-row :gutter="20" class="el-row" type="flex">
+            <el-col class="el-col" type="flex">
+              <div class="text item">
+                <el-form-item prop="uniqueId">
+                  <span span="10" slot="label">U盾唯一ID</span>
+                  <el-input
+                    v-model="inputQuery.uniqueId"
+                    placeholder="U盾唯一ID"
+                    disabled=true
+                    style="width:100%;"
+                  ></el-input>
+                </el-form-item>
+                </div>
+              </el-col>
+            <el-col class="el-col" type="flex">
+            <div v-if="!inputQuery.id">
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  @click.native.stop="readUdInfo"
+                >读取U盾
+                </el-button
+                >
+              </el-button-group>
+            </div>
+            </el-col>
+          </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">U盾序列号</span>
+                <el-input
+                  v-model="inputQuery.serialNumber"
+                  placeholder="U盾序列号"
+                  disabled=true
+                  style="width:100%;"
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex"></el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">用户名</span>
+                <el-input
+                  v-model="inputQuery.userName"
+                  placeholder="用户名"
+                  style="width:100%;"
+                ></el-input>
+                <div style="color: red">特别注意：修改用户名后需要重新设置秘钥</div>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex">
+            <div>
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  @click.native.stop="createUserName"
+                >随机生成
+                </el-button
+                >
+              </el-button-group>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">备注</span>
+                <el-input
+                  v-model="inputQuery.remark"
+                  placeholder="备注"
+                  style="width:100%;"
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex"></el-col>
+        </el-row>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {saveUd} from  "@/api/ud/ud";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+import SoftKey3A from '@/utils/UsbKey3A/SoftKey3A'
+import {isBlank} from "@/utils/strUtil";
+
+function myonLoad() {
+  try {
+    var s_pnp=new SoftKey3A();
+    s_pnp.Socket_UK.onopen = function() {
+
+    }
+    //在使用事件插拨时，注意，一定不要关掉Sockey，否则无法监测事件插拨
+    s_pnp.Socket_UK.onmessage =function got_packet(Msg) {
+      var PnpData = JSON.parse(Msg.data);
+      if(PnpData.type=="PnpEvent"){
+        if(PnpData.IsIn) {
+          console.log("UKEY已被插入，被插入的锁的路径是："+PnpData.DevicePath);
+        }
+        else {
+          console.log("UKEY已被拨出，被拨出的锁的路径是："+PnpData.DevicePath);
+        }
+      }
+    }
+    s_pnp.Socket_UK.onclose = function() {
+
+    }
+  }
+  catch(e){
+    this.$message.error(e.name + ": " + e.message);
+    return false;
+  }
+}
+
+export default {
+  name: "udDialog",
+  KeyID:"",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+    }
+  },
+  mounted() {
+    myonLoad();
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        saveUd(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        saveUd(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+    readUdInfo:async function(){
+      var DevicePath
+      var mSoftKey3A=new SoftKey3A();//注意，由于USB的操作是异步的，所以所有函数的调用前必须加await !!!!!!!!!
+      DevicePath =await mSoftKey3A.FindPort(1);//'查找是否存在多把加密锁
+      if( mSoftKey3A.GetLastError()== 0 ) {
+        this.$message.error( "系统上发现有2把及以上的加密锁，请只插入要进行的加密锁。");return false;
+      }
+      DevicePath =await mSoftKey3A.FindPort(0);//'查找是否存在加密锁
+      if( mSoftKey3A.GetLastError()!= 0 ) {
+        this.$message.error( "未发现加密锁，请插入加密锁");return false;
+      }
+
+      //读取加密锁的芯片唯一ID，某些旧的型号可能没有芯片唯一ID，可以用加密狗ID
+      {
+        this.inputQuery.uniqueId = await mSoftKey3A.GetChipID(DevicePath);
+        if (mSoftKey3A.GetLastError() != 0) {
+          //某些旧的型号可能没有芯片唯一ID，可以用加密狗ID
+          this.inputQuery.uniqueId = toHex(await mSoftKey3A.GetID_1(DevicePath)) + toHex(await mSoftKey3A.GetID_2(DevicePath));
+          if (mSoftKey3A.GetLastError() != 0) {
+            this.$message.error("获取ID错误,错误码是" + mSoftKey3A.GetLastError().toString());
+            return false;
+          }
+        }
+      }
+
+      //从锁中取出用户身份，与签名后的数据一并送到服务端进行验证。以验证用户身份
+      this.inputQuery.userName=await mSoftKey3A.GetSm2UserName(DevicePath);
+      if( mSoftKey3A.GetLastError()!= 0 ) {
+        this.$message.error(  "返回用户身份时出现错误，错误码为："+mSoftKey3A.GetLastError().toString());
+        return  false;
+      }
+
+
+    },
+    createUserName(){
+      //可获取的字符串
+      const chars = 'ABCDEFGHIJKLMNOPQRSTUVWSYZabcdefghijklmnopqrstuvwsyz0123456789';
+      const list = [];
+      //通过随机获取八个字符串的索引下标
+      for (let i = 0; i < 8; i++) {
+        //61为chars字符串长度为62，注意索引是从0开始的
+        const val_1 = Math.round(Math.random() * 61);
+        list.push(val_1);
+      }
+
+      //再根据随机获取的8个字符串索引拿到这8个字符串进行拼接
+      let passwd = '';
+      for (let n = 0; n < list.length; n++) {
+        passwd += chars.charAt(list[n]);
+      }
+      this.inputQuery.userName= passwd;
+    }
+  },
+  components: {},
+  created() {
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ud/udInfoKeyDialog.vue

@@ -0,0 +1,244 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+          <el-row :gutter="20" class="el-row" type="flex">
+            <el-col class="el-col" type="flex">
+              <div class="text item">
+                <el-form-item prop="uniqueId">
+                  <span span="10" slot="label">U盾唯一ID</span>
+                  <el-input
+                    v-model="inputQuery.uniqueId"
+                    placeholder="U盾唯一ID"
+                    disabled=true
+                    style="width:100%;"
+                  ></el-input>
+                </el-form-item>
+                </div>
+              </el-col>
+            <el-col class="el-col" type="flex">
+            </el-col>
+          </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">U盾序列号</span>
+                <el-input
+                  v-model="inputQuery.serialNumber"
+                  placeholder="U盾序列号"
+                  disabled=true
+                  style="width:100%;"
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex"></el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">用户名</span>
+                <el-input
+                  v-model="inputQuery.userName"
+                  placeholder="用户名"
+                  disabled=true
+                  style="width:100%;"
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex"></el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">私钥</span>
+                <el-input
+                  v-model="inputQuery.privateKey"
+                  placeholder="私钥"
+                  style="width:100%;"
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex">
+            <div>
+              <el-button-group>
+                <el-button
+                  type="primary"
+                  @click.native.stop="createKey"
+                >生成秘钥
+                </el-button
+                >
+              </el-button-group>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">公钥X</span>
+                <el-input
+                  v-model="inputQuery.publicKeyX"
+                  placeholder="公钥X"
+                  style="width:100%;"
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex"></el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">公钥Y</span>
+                <el-input
+                  v-model="inputQuery.privateKey"
+                  placeholder="公钥Y"
+                  style="width:100%;"
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex"></el-col>
+        </el-row>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button type="primary" @click="setKey">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {saveUd} from  "@/api/ud/ud";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+import SoftKey3A from '@/utils/UsbKey3A/SoftKey3A'
+import {isBlank} from "@/utils/strUtil";
+
+function myonLoad() {
+  try {
+    var s_pnp=new SoftKey3A();
+    s_pnp.Socket_UK.onopen = function() {
+
+    }
+    //在使用事件插拨时，注意，一定不要关掉Sockey，否则无法监测事件插拨
+    s_pnp.Socket_UK.onmessage =function got_packet(Msg) {
+      var PnpData = JSON.parse(Msg.data);
+      if(PnpData.type=="PnpEvent"){
+        if(PnpData.IsIn) {
+          console.log("UKEY已被插入，被插入的锁的路径是："+PnpData.DevicePath);
+        }
+        else {
+          console.log("UKEY已被拨出，被拨出的锁的路径是："+PnpData.DevicePath);
+        }
+      }
+    }
+    s_pnp.Socket_UK.onclose = function() {
+
+    }
+  }
+  catch(e){
+    this.$message.error(e.name + ": " + e.message);
+    return false;
+  }
+}
+
+export default {
+  name: "udDialog",
+  KeyID:"",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+    }
+  },
+  mounted() {
+    myonLoad();
+  },
+  methods: {
+    submitInv(){
+      this.inputQuery.type="key"
+        saveUd(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.$message.success("设置成功！");
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+    },
+    createKey:async function(){
+      var DevicePath
+      var mSoftKey3A=new SoftKey3A();//注意，由于USB的操作是异步的，所以所有函数的调用前必须加await !!!!!!!!!
+      DevicePath =await mSoftKey3A.FindPort(1);//'查找是否存在多把加密锁
+      if( mSoftKey3A.GetLastError()== 0 ) {
+        this.$message.error( "系统上发现有2把及以上的加密锁，请只插入要进行的加密锁。");return false;
+      }
+      DevicePath =await mSoftKey3A.FindPort(0);//'查找是否存在加密锁
+      if( mSoftKey3A.GetLastError()!= 0 ) {
+        this.$message.error( "未发现加密锁，请插入加密锁");return false;
+      }
+      var KeyPairInfo =await mSoftKey3A.StarGenKeyPair(DevicePath);
+      this.inputQuery.privateKey = KeyPairInfo.GenPriKey
+      this.inputQuery.publicKeyX = KeyPairInfo.GenPubKeyX
+      this.inputQuery.publicKeyY = KeyPairInfo.GenPubKeyY
+    },
+    setKey:async function(){
+      if (isBlank(this.inputQuery.privateKey) || isBlank(this.inputQuery.publicKeyX) || isBlank(this.inputQuery.publicKeyY)) {
+        this.$message.error("秘钥不能为空！");
+        return;
+      }
+
+      var DevicePath
+      var mSoftKey3A=new SoftKey3A();//注意，由于USB的操作是异步的，所以所有函数的调用前必须加await !!!!!!!!!
+      DevicePath =await mSoftKey3A.FindPort(1);//'查找是否存在多把加密锁
+      if( mSoftKey3A.GetLastError()== 0 ) {
+        this.$message.error( "系统上发现有2把及以上的加密锁，请只插入要进行的加密锁。");return false;
+      }
+      DevicePath =await mSoftKey3A.FindPort(0);//'查找是否存在加密锁
+      if( mSoftKey3A.GetLastError()!= 0 ) {
+        this.$message.error( "未发现加密锁，请插入加密锁");return false;
+      }
+
+      var re =await mSoftKey3A.Set_SM2_KeyPair(this.inputQuery.privateKey,this.inputQuery.publicKeyX,this.inputQuery.publicKeyY,this.inputQuery.userName,DevicePath);
+      if( re != 0 ) {
+        this.$message.error( "设置失败");return false;
+      }
+      this.submitInv();
+    }
+  },
+  components: {},
+  created() {
+
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ud/udInfoPinDialog.vue

@@ -0,0 +1,195 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+          <el-row :gutter="20" class="el-row" type="flex">
+            <el-col class="el-col" type="flex">
+              <div class="text item">
+                <el-form-item prop="uniqueId">
+                  <span span="10" slot="label">U盾唯一ID</span>
+                  <el-input
+                    v-model="inputQuery.uniqueId"
+                    placeholder="U盾唯一ID"
+                    disabled=true
+                    style="width:100%;"
+                  ></el-input>
+                </el-form-item>
+                </div>
+              </el-col>
+            <el-col class="el-col" type="flex">
+            </el-col>
+          </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">U盾序列号</span>
+                <el-input
+                  v-model="inputQuery.serialNumber"
+                  placeholder="U盾序列号"
+                  disabled=true
+                  style="width:100%;"
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex"></el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">旧pin码</span>
+                <el-input
+                  v-model="oldPin"
+                  placeholder="pin码"
+                  style="width:100%;"
+                  disabled=true
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex"></el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+          <el-col class="el-col" type="flex">
+            <div class="text item">
+              <el-form-item prop="uniqueId">
+                <span span="10" slot="label">pin码</span>
+                <el-input
+                  v-model="inputQuery.pin"
+                  placeholder="pin码"
+                  style="width:100%;"
+                ></el-input>
+              </el-form-item>
+            </div>
+          </el-col>
+          <el-col class="el-col" type="flex"></el-col>
+        </el-row>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button type="primary" @click="setPin">设置</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {saveUd} from  "@/api/ud/ud";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+import SoftKey3A from '@/utils/UsbKey3A/SoftKey3A'
+import {isBlank} from "@/utils/strUtil";
+
+
+function myonLoad() {
+  try {
+    var s_pnp=new SoftKey3A();
+    s_pnp.Socket_UK.onopen = function() {
+
+    }
+    //在使用事件插拨时，注意，一定不要关掉Sockey，否则无法监测事件插拨
+    s_pnp.Socket_UK.onmessage =function got_packet(Msg) {
+      var PnpData = JSON.parse(Msg.data);
+      if(PnpData.type=="PnpEvent"){
+        if(PnpData.IsIn) {
+          console.log("UKEY已被插入，被插入的锁的路径是："+PnpData.DevicePath);
+        }
+        else {
+          console.log("UKEY已被拨出，被拨出的锁的路径是："+PnpData.DevicePath);
+        }
+      }
+    }
+    s_pnp.Socket_UK.onclose = function() {
+
+    }
+  }
+  catch(e){
+    this.$message.error(e.name + ": " + e.message);
+    return false;
+  }
+}
+
+export default {
+  name: "udDialog",
+  KeyID:"",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      oldPin:"",
+    }
+  },
+  mounted() {
+    myonLoad();
+  },
+  methods: {
+    submitInv(){
+      this.inputQuery.type="pin"
+        saveUd(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.$message.success("设置成功！");
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("设置失败");
+          });
+      },
+    setPin:async function(){
+      if (isBlank(this.inputQuery.pin)) {
+        this.$message.error("pin码不能为空！");
+        return;
+      }
+      if (this.inputQuery.pin.length > 16) {
+        this.$message.error("pin码不能超过16位！");
+        return;
+      }
+      var DevicePath
+      var mSoftKey3A=new SoftKey3A();//注意，由于USB的操作是异步的，所以所有函数的调用前必须加await !!!!!!!!!
+      DevicePath =await mSoftKey3A.FindPort(1);//'查找是否存在多把加密锁
+      if( mSoftKey3A.GetLastError()== 0 ) {
+        this.$message.error( "系统上发现有2把及以上的加密锁，请只插入要进行的加密锁。");return false;
+      }
+      DevicePath =await mSoftKey3A.FindPort(0);//'查找是否存在加密锁
+      if( mSoftKey3A.GetLastError()!= 0 ) {
+        this.$message.error( "未发现加密锁，请插入加密锁");return false;
+      }
+      if( this.oldPin ==  this.inputQuery.pin) {
+        this.$message.error( "新旧密码不能一致");return false;
+      }
+      var re =await mSoftKey3A.YtSetPin(this.oldPin,this.inputQuery.pin,DevicePath);
+      if( re != 0 ) {
+        this.$message.error( "设置失败，旧密码错误");return false;
+      }
+      this.submitInv();
+    }
+  },
+  components: {},
+  created() {
+      this.oldPin = this.inputQuery.pin
+    this.inputQuery.pin = ""
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ud/udManage.vue

@@ -0,0 +1,363 @@
+<template>
+  <div>
+    <el-card>
+      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="120px" v-show="showSearch" :inline="true">
+        <el-row style=" display:flex;  flex-wrap: wrap; ">
+          <template v-for="(item, index) in queryList" >
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+              <el-input
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                @keyup.enter.native="executeFuc($event,'5',item.clickFuc)"
+                clearable
+              ></el-input>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select v-model="filterQuery[item.columnName]"
+                         :placeholder="item.columnDesc"
+                         :disabled="executeEval(null,item.disabledFuc,false)"
+                         clearable>
+                <el-option
+                  v-for="dict in item.lableRuleObj"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-select
+                v-model="filterQuery[item.columnName]"
+                :placeholder="item.columnDesc"
+                @change="executeFuc($event,'5',item.checkRules)"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                filterable
+                remote
+                :remote-method="(query) => executeFuc(query,'5',item.clickFuc)"
+                clearable>
+                <el-option
+                  v-for="item in options[item.clickFuc]"
+                  :key="item.code"
+                  :label="item.label"
+                  :value="item.code"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                :picker-options="pickerOptions"
+                v-model="actDateRange"
+                type="daterange"
+                format="yyyy 年 MM 月 dd 日"
+                value-format="yyyy-MM-dd"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+              ></el-date-picker>
+            </el-form-item>
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+              <el-date-picker
+                v-model="filterQuery[item.columnName]"
+                :style="`width:${item.width+'px'}`"
+                value-format="yyyy-MM-dd"
+                :disabled="executeEval(null,item.disabledFuc,false)"
+                type="date"
+                :placeholder="item.columnDesc"
+              ></el-date-picker>
+            </el-form-item>
+          </template>
+        </el-row>
+      </el-form>
+      <div class="top-right-btn">
+        <el-button-group>
+          <el-button icon="el-icon-view" type="primary" @click="hideSearch">显示/隐藏搜索栏</el-button>
+          <el-button
+            type="primary"
+            icon="el-icon-refresh"
+            @click="onReset"
+          >重置
+          </el-button>
+          <el-button type="primary" icon="el-icon-search" @click="onSubmit"
+          >查询
+          </el-button
+          >
+          <el-button type="primary" icon="el-icon-plus" @click="(event) => addOrderMuti()">新增</el-button>
+        </el-button-group>
+      </div>
+      <el-table v-loading="loading" :data="list" style="width: 100%"  border highlight-current-row>
+        <template v-for="(item, index) in tableHeader">
+          <el-table-column
+            v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
+            type="index" :label="item.columnDesc"></el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'selection'"
+            type="selection"
+            :width="item.width"
+            :selectable="(row,number) => executeFuc(row,'3',item.clickFuc)"
+          ></el-table-column>
+
+          <el-table-column
+            v-if="item.columnType == 'radio' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template  slot-scope="scope">
+              <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'laber' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'eltag' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template   slot-scope="scope">
+              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+              </el-tag>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'button' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :width="item.width"
+            :key="item.columnName"
+            fixed="right"
+          >
+            <template slot-scope="scope">
+              <el-button v-for="(buttonItem, buttonIndex) in item.buttonRulObj"
+                         :type="buttonItem.type"
+                         :size="buttonItem.size"
+                         :style="buttonItem.style"
+                         :key="buttonItem"
+                         v-if="executeEval(scope.row,buttonItem.hasPermi,true)"
+                         :disabled="executeEval(scope.row,buttonItem.disabledFuc,false)"
+                         @click.native.stop="executeFuc(scope.row,'1',buttonItem.clickFuc)"
+              >{{ buttonItem.name }}
+              </el-button>
+            </template>
+          </el-table-column>
+          <el-table-column
+            v-if="item.columnType == 'text' && executeEval(row,item.expression,true)"
+            :prop="item.columnName"
+            :label="item.columnDesc"
+            :sortable="item.sort"
+            :width="item.width"
+            :show-overflow-tooltip="item.tooltip"
+            :key="item.columnName"
+          >
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+            </template>
+          </el-table-column>
+        </template>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="filterQuery.page"
+        :limit.sync="filterQuery.limit"
+        @pagination="handleCurrentChange"
+
+      ></pagination>
+    </el-card>
+
+
+    <el-dialog
+      title="分配企业"
+      :visible.sync="allocateVisible"
+      :before-close="close"
+      width="30%"
+      v-if="allocateVisible"
+      @close='closeAllocateDialog'
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+    >
+      <udManageDialog
+        :closeDialog="closeAllocateDialog"
+        :inputQuery="inputQuery"
+        formName="分配企业"
+      ></udManageDialog>
+    </el-dialog>
+
+  </div>
+</template>
+
+
+
+<script>
+import udManageDialog from "@/views/ud/udManageDialog";
+import {deleteUd, listUd,checkUd} from "@/api/ud/ud";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "anncmntDev",
+  data() {
+    return {
+      anno:false,
+      showSearch: true,
+      filterQuery: {
+        page: 1,
+        limit: 10,
+      },
+      total: 0,
+      loading: false,
+      list: [],
+
+      inputQuery:{},
+      allocateVisible: false,
+      actDateRange: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: "最近一周",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近一个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+          {
+            text: "最近三个月",
+            onClick(picker) {
+              const end = new Date();
+              const start = new Date();
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+              picker.$emit("pick", [start, end]);
+            },
+          },
+        ],
+      },
+    };
+  },
+  methods: {
+    onSubmit() {
+      if (this.actDateRange !== null) {
+        this.filterQuery.startTime = this.actDateRange[0];
+        this.filterQuery.endTime = this.actDateRange[1];
+      } else {
+        this.filterQuery.startTime = null;
+        this.filterQuery.endTime = null;
+      }
+      this.filterQuery.page = 1;
+      this.getList();
+    },
+    onReset() {
+      this.$router.push({
+        path: "",
+      });
+      this.filterQuery = {
+        page: 1,
+        limit: 10,
+      };
+      this.getList();
+    },
+    hideSearch() {
+      this.showSearch = !this.showSearch;
+    },
+    handleCurrentChange(val) {
+      this.filterQuery.page = val.page;
+      this.getList();
+    },
+    allocateDialog(_this,row){
+      _this.inputQuery=row;
+      _this.allocateVisible = true;
+    },
+    closeAllocateDialog(){
+      this.allocateVisible = false;
+      this.getList();
+    },
+    getList() {
+      this.loading = true;
+      listUd(this.filterQuery)
+        .then((response) => {
+          this.loading = false;
+          this.list = response.data.list || [];
+          this.total = response.data.total || 0;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    deleteDialog(_this,row) {
+      _this.$confirm("确认删除吗?", "提示", {
+          type: "warning",
+        })
+        .then(() => {
+        deletegg(row)
+          .then((response) => {
+            if(response.code == 20000){
+              _this.getList()
+            }else{
+              _this.$message.error(response.message);
+            }
+          })
+          .catch(() => {
+            _this.$message.error(response.message);
+          });
+        });
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    }
+  },
+  components: {udManageDialog},
+  created() {
+     getHead("udManage","1").then((re) => {
+       // 处理返回的数据
+       this.tableObj = re.data;
+       this.tableHeader = re.data.tableList;
+       this.queryList = re.data.queryList;
+       this.fromList = re.data.fromList;
+       this.getList()
+     });
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ud/udManageDialog.vue

@@ -0,0 +1,109 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+          <el-row :gutter="20" class="el-row" type="flex">
+            <el-col class="el-col" type="flex">
+              <div class="text item">
+                <el-form-item prop="uniqueId">
+                  <span span="10" slot="label">使用企业</span>
+                  <el-select
+                    v-model="inputQuery.companyId"
+                    placeholder="使用企业"
+                    :loading="corpLoading"
+                    filterable
+                    remote
+                    :remote-method="findMethod"
+                    clearable>
+                    <el-option
+                      v-for="item in fromOptions"
+                      :key="item.companyName"
+                      :label="item.companyName"
+                      :value="item.id"
+                    >
+                      <span style="float: left">{{ item.companyName }}</span>
+                    </el-option>
+                  </el-select>
+                </el-form-item>
+                </div>
+              </el-col>
+          </el-row>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {allocateUd} from  "@/api/ud/ud";
+import {seachCompany} from "@/api/basic/udiRlCompany";
+
+
+
+export default {
+  name: "udDialog",
+  KeyID:"",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      corpLoading:false,
+      fromOptions :[],
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    submitInv(){
+      allocateUd(this.inputQuery,"add").then((response) => {
+        if(response.code == 20000){
+          this.closeDialog();
+        }else{
+          this.$message.error(response.message);
+        }
+
+      })
+        .catch(() => {
+          this.$message.error("分配失败");
+        });
+    },
+    findMethod(key) {
+      this.corpLoading = true;
+      let params = {
+        searchKey: key,
+        page: 1,
+        limit: 10
+      };
+      seachCompany(params).then((res) => {
+        this.corpLoading = false;
+        this.fromOptions = res.data.list || [];
+      }).catch(() => {
+        this.corpLoading = false;
+      })
+    },
+  },
+  components: {},
+  created() {
+    this.findMethod();
+  },
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ud/udPlanDialog.vue

@@ -0,0 +1,216 @@
+<template>
+  <div>
+    <el-card>
+      <el-form  :model="inputQuery"  label-width="120px" >
+        <template v-for="(itemRow, indexRow) in fromList">
+          <el-row :gutter="20" class="el-row" type="flex">
+            <template v-for="(item, index) in itemRow.list">
+              <el-col :span="item.width" class="el-col" type="flex">
+                <div class="text item">
+                  <el-form-item v-if="item.columnType =='input'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-input
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      :size="item.size"
+                      :type="item.inputType"
+                      :placeholder="item.columnDesc"
+                      :disabled="item.disabled"
+                      @input="executeFuc($event,'5',item.clickFuc)"
+                      :autosize="{ minRows: 4, maxRows: 9}"
+                    ></el-input>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='radio'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-radio-group :style="item.style" v-model="inputQuery[item.columnName]">
+                      <el-radio
+                        v-for="dict in item.lableRuleObj"
+                        :key="parseInt(dict.value)"
+                        :label="parseInt(dict.value)"
+                        :disabled="item.disabled"
+                      >{{dict.label}}</el-radio>
+                    </el-radio-group>
+                  </el-form-item>
+
+                  <el-form-item v-if="item.columnType =='select'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select v-model="inputQuery[item.columnName]" :style="item.style">
+                      <el-option
+                        v-for="dict in item.lableRuleObj"
+                        :key="dict.value"
+                        :label="dict.label"
+                        :value="dict.value"
+                      />
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='selectServer'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-select
+                      v-model="inputQuery[item.columnName]"
+                      :placeholder="item.columnDesc"
+                       :style="item.style"
+                      @change="executeFuc($event,'5',item.clickFuc)"
+                      :disabled="executeEval(null,item.disabledFuc,false)"
+                      filterable
+                      remote
+                      :remote-method="(query) => executeFuc(query,'5',item.dataFuc)"
+                      clearable>
+                      <el-option
+                        v-for="item in options[item.dataFuc]"
+                        :key="item.code"
+                        :label="item.code"
+                        :value="item.code"
+                      >
+                        <span style="float: left">{{ item.code }}</span>
+                        <span style="float: right; color: #8492a6; font-size: 13px;width:200px">{{
+                            item.productName
+                          }}</span>
+                      </el-option>
+                    </el-select>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='date'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd"
+                      type="date"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='datetime'"  :rules="item.checkRulesObj" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <el-date-picker
+                      v-model="inputQuery[item.columnName]"
+                      :style="item.style"
+                      value-format="yyyy-MM-dd HH:mm:ss"
+                      type="datetime"
+                      :placeholder="item.columnDesc"
+                    ></el-date-picker>
+                  </el-form-item>
+                  <el-form-item v-if="item.columnType =='treeCustom'" :prop="item.columnName">
+                        <span slot="label">
+                          {{item.columnDesc}}
+                        </span>
+                    <treeselect
+                      v-model="inputQuery[item.columnName]"
+                      :options="menuOptions"
+                      :normalizer="normalizer"
+                      :show-count="true"
+                      :placeholder="item.columnName"
+                    />
+                  </el-form-item>
+                </div>
+              </el-col>
+            </template>
+          </el-row>
+        </template>
+        <div style='text-align: center; margin-bottom: 10px;margin-top: 18px ;'>
+          <el-button type="primary" @click="submitInv">提交</el-button>
+          <el-button  @click="closeDialog">取消</el-button>
+        </div>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+
+<script>
+import {savePlan} from  "@/api/ud/udPlan";
+import {
+  getHead,executeFuc
+} from "@/utils/customConfig";
+
+export default {
+  name: "planDialog",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
+    },
+    formName: {
+      type: Object,
+      required: true,
+    },
+    inputQuery: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      tableHeader:[],
+      queryList:[],
+      fromList:[],
+      tableObj:[],
+      invList:[],
+      options: {
+      }
+    }
+  },
+  methods: {
+    submitInv(){
+      if(this.formName==1){
+        savePlan(this.inputQuery,"add").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }else{
+        savePlan(this.inputQuery,"edit").then((response) => {
+          if(response.code == 20000){
+            this.closeDialog();
+          }else{
+            this.$message.error(response.message);
+          }
+
+        })
+          .catch(() => {
+            this.$message.error("添加失败");
+          });
+      }
+    },
+    executeFuc(row,type,clickFuc,value){
+      return executeFuc(this,row,type,clickFuc,value);
+    },
+    executeEval(row,expression,defaultRet){
+      if(expression){
+        return eval(expression);
+      }
+      return defaultRet;
+    },
+  },
+  components: {},
+  created() {
+    getHead("ud-plan","1").then((re) => {
+      // 处理返回的数据
+      this.tableObj = re.data;
+      this.tableHeader = re.data.tableList;
+      this.queryList = re.data.queryList;
+      this.fromList = re.data.fromList;
+    });
+  },
+}
+</script>
+
+<style scoped>
+
+</style>