iv-npm 1.2.68 → 1.2.71

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iv-npm",
-  "version": "1.2.68",
+  "version": "1.2.71",
   "description": "公共通用包",
   "author": "Mr.Cong",
   "license": "ISC",

package/packages/shared/package.json

@@ -1,31 +1,31 @@
-{
-  "name": "@IVNPM/shared",
-  "version": "1.0.0",
-  "private": false,
-  "description": "IVNPM/shared",
-  "scripts": {
-    "prepare": "npm run build",
-    "dev": "tsup --watch",
-    "build": "tsup"
-  },
-  "main": "dist/utils/index.mjs",
-  "module": "dist/utils/index.mjs",
-  "types": "dist/utils/index.d.ts",
-  "files": [
-    "index.js",
-    "dist"
-  ],
-  "author": "Mr.Cong",
-  "license": "ISC",
-  "devDependencies": {
-    "@types/node": "^18.6.4",
-    "rollup-plugin-copy": "^3.4.0",
-    "tsup": "^6.2.1"
-  },
-  "peerDependencies": {
-    "ant-design-vue": "^3.2.5"
-  },
-  "dependencies": {
-    "nanoid": "^4.0.0"
-  }
-}
+{
+  "name": "@IVNPM/shared",
+  "version": "1.0.0",
+  "private": false,
+  "description": "IVNPM/shared",
+  "scripts": {
+    "prepare": "npm run build",
+    "dev": "tsup --watch",
+    "build": "tsup"
+  },
+  "main": "dist/utils/index.mjs",
+  "module": "dist/utils/index.mjs",
+  "types": "dist/utils/index.d.ts",
+  "files": [
+    "index.js",
+    "dist"
+  ],
+  "author": "Mr.Cong",
+  "license": "ISC",
+  "devDependencies": {
+    "@types/node": "^18.6.4",
+    "rollup-plugin-copy": "^3.4.0",
+    "tsup": "^6.2.1"
+  },
+  "peerDependencies": {
+    "ant-design-vue": "^3.2.5"
+  },
+  "dependencies": {
+    "nanoid": "^4.0.0"
+  }
+}

package/packages/ui/dist/business-ui/component/IVContractSelector.d.ts

@@ -23,6 +23,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         required: false;
     };
+    contractType: {
+        type: NumberConstructor;
+        required: false;
+    };
 }, (_ctx: any, _cache: any) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
 }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:show" | "getItem")[], "update:show" | "getItem", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -47,6 +51,10 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         required: false;
     };
+    contractType: {
+        type: NumberConstructor;
+        required: false;
+    };
 }>> & {
     "onUpdate:show"?: ((...args: any[]) => any) | undefined;
     onGetItem?: ((...args: any[]) => any) | undefined;

package/packages/ui/dist/index.cjs.js

@@ -7794,13 +7794,17 @@ var script = /*#__PURE__*/vue.defineComponent({
     setOfBookId: {
       type: String,
       required: false
+    },
+    contractType: {
+      type: Number,
+      required: false
     }
   },
   emits: ["update:show", "getItem"],
   setup: function setup(__props, _ref) {
     var emit = _ref.emit;
 
-    var _a;
+    var _a, _b;
 
     var props = __props;
     /**
@@ -7808,7 +7812,8 @@ var script = /*#__PURE__*/vue.defineComponent({
      * */
 
     var formData = vue.reactive({
-      setOfBookId: (_a = props.params.setOfBookId) !== null && _a !== void 0 ? _a : "",
+      setOfBookId: (_a = props.params.setOfBookId) !== null && _a !== void 0 ? _a : undefined,
+      contractType: (_b = props.params.contractType) !== null && _b !== void 0 ? _b : undefined,
       skipCount: 0,
       maxResultCount: 10,
       key: null
@@ -7842,7 +7847,35 @@ var script = /*#__PURE__*/vue.defineComponent({
                 _yield$formatHTTP = _context.sent;
                 items = _yield$formatHTTP.items;
                 totalCount = _yield$formatHTTP.totalCount;
-                dataV.value = items;
+                dataV.value = items.map(function (item) {
+                  if (item.signStatus == 0) {
+                    item.signStatus = "待开工";
+                  } else if (item.signStatus == 1) {
+                    item.signStatus = "在建";
+                  } else if (item.signStatus == 2) {
+                    item.signStatus = "完工未结算";
+                  } else if (item.signStatus == 4) {
+                    item.signStatus = "完工已结算";
+                  } else if (item.signStatus == 8) {
+                    item.signStatus = "已销项";
+                  } else {
+                    item.signStatus = "暂无";
+                  }
+
+                  if (item.projectStatus == 1) {
+                    item.projectStatus = "待签约";
+                  } else if (item.projectStatus == 2) {
+                    item.projectStatus = "已签约";
+                  } else if (item.projectStatus == 4) {
+                    item.projectStatus = "已完结";
+                  } else if (item.projectStatus == 8) {
+                    item.projectStatus = "诉讼中";
+                  } else {
+                    item.projectStatus = "暂无";
+                  }
+
+                  return item;
+                });
                 totalPages.value = totalCount;
                 topPages.value = Math.ceil(totalPages.value / formData.maxResultCount);
 
@@ -7871,17 +7904,17 @@ var script = /*#__PURE__*/vue.defineComponent({
     }, {
       title: "编号",
       w: 104 / 1499 * 100 + "%",
-      key: "projectNumber",
+      key: "serialNumber",
       show: true
     }, {
       title: "合同名称",
       w: 212 / 1499 * 100 + "%",
-      key: "contractName",
+      key: "name",
       show: true
     }, {
       title: "合同简称",
       w: 140 / 1499 * 100 + "%",
-      key: "contractShortName",
+      key: "shortName",
       show: true
     }, {
       title: "账套名称",
@@ -7893,6 +7926,16 @@ var script = /*#__PURE__*/vue.defineComponent({
       w: 140 / 1499 * 100 + "%",
       key: "setOfBookShortName",
       show: true
+    }, {
+      title: "签署状态",
+      w: 140 / 1499 * 100 + "%",
+      key: "signStatus",
+      show: true
+    }, {
+      title: "项目状态",
+      w: 140 / 1499 * 100 + "%",
+      key: "projectStatus",
+      show: true
     }, {
       title: "",
       w: 45 / 1333 * 100 + "%",
@@ -7914,20 +7957,20 @@ var script = /*#__PURE__*/vue.defineComponent({
 
 
     function _sendItem() {
-      _sendItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      _sendItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(item) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 emit("getItem", JSON.stringify(item));
                 inputV.value = false;
 
               case 2:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2);
+        }, _callee3);
       }));
       return _sendItem.apply(this, arguments);
     }
@@ -7992,6 +8035,34 @@ var script = /*#__PURE__*/vue.defineComponent({
         emit("update:show", value);
       }
     });
+    vue.watch(function () {
+      return props.params;
+    }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _a, _b;
+
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              // 由于打包问题，侦听器一定要在最后，否则找不到getData方法
+              formData.setOfBookId = (_a = props.params.setOfBookId) !== null && _a !== void 0 ? _a : undefined;
+              formData.contractType = (_b = props.params.contractType) !== null && _b !== void 0 ? _b : undefined;
+              getData({
+                params: formData
+              });
+
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    })));
+    vue.watch(function () {
+      return props;
+    }, function () {
+      console.log(props);
+    });
     return function (_ctx, _cache) {
       var _component_a_input = vue.resolveComponent("a-input");
 

package/packages/ui/dist/index.esm.js

@@ -7790,13 +7790,17 @@ var script = /*#__PURE__*/defineComponent({
     setOfBookId: {
       type: String,
       required: false
+    },
+    contractType: {
+      type: Number,
+      required: false
     }
   },
   emits: ["update:show", "getItem"],
   setup: function setup(__props, _ref) {
     var emit = _ref.emit;
 
-    var _a;
+    var _a, _b;
 
     var props = __props;
     /**
@@ -7804,7 +7808,8 @@ var script = /*#__PURE__*/defineComponent({
      * */
 
     var formData = reactive({
-      setOfBookId: (_a = props.params.setOfBookId) !== null && _a !== void 0 ? _a : "",
+      setOfBookId: (_a = props.params.setOfBookId) !== null && _a !== void 0 ? _a : undefined,
+      contractType: (_b = props.params.contractType) !== null && _b !== void 0 ? _b : undefined,
       skipCount: 0,
       maxResultCount: 10,
       key: null
@@ -7838,7 +7843,35 @@ var script = /*#__PURE__*/defineComponent({
                 _yield$formatHTTP = _context.sent;
                 items = _yield$formatHTTP.items;
                 totalCount = _yield$formatHTTP.totalCount;
-                dataV.value = items;
+                dataV.value = items.map(function (item) {
+                  if (item.signStatus == 0) {
+                    item.signStatus = "待开工";
+                  } else if (item.signStatus == 1) {
+                    item.signStatus = "在建";
+                  } else if (item.signStatus == 2) {
+                    item.signStatus = "完工未结算";
+                  } else if (item.signStatus == 4) {
+                    item.signStatus = "完工已结算";
+                  } else if (item.signStatus == 8) {
+                    item.signStatus = "已销项";
+                  } else {
+                    item.signStatus = "暂无";
+                  }
+
+                  if (item.projectStatus == 1) {
+                    item.projectStatus = "待签约";
+                  } else if (item.projectStatus == 2) {
+                    item.projectStatus = "已签约";
+                  } else if (item.projectStatus == 4) {
+                    item.projectStatus = "已完结";
+                  } else if (item.projectStatus == 8) {
+                    item.projectStatus = "诉讼中";
+                  } else {
+                    item.projectStatus = "暂无";
+                  }
+
+                  return item;
+                });
                 totalPages.value = totalCount;
                 topPages.value = Math.ceil(totalPages.value / formData.maxResultCount);
 
@@ -7867,17 +7900,17 @@ var script = /*#__PURE__*/defineComponent({
     }, {
       title: "编号",
       w: 104 / 1499 * 100 + "%",
-      key: "projectNumber",
+      key: "serialNumber",
       show: true
     }, {
       title: "合同名称",
       w: 212 / 1499 * 100 + "%",
-      key: "contractName",
+      key: "name",
       show: true
     }, {
       title: "合同简称",
       w: 140 / 1499 * 100 + "%",
-      key: "contractShortName",
+      key: "shortName",
       show: true
     }, {
       title: "账套名称",
@@ -7889,6 +7922,16 @@ var script = /*#__PURE__*/defineComponent({
       w: 140 / 1499 * 100 + "%",
       key: "setOfBookShortName",
       show: true
+    }, {
+      title: "签署状态",
+      w: 140 / 1499 * 100 + "%",
+      key: "signStatus",
+      show: true
+    }, {
+      title: "项目状态",
+      w: 140 / 1499 * 100 + "%",
+      key: "projectStatus",
+      show: true
     }, {
       title: "",
       w: 45 / 1333 * 100 + "%",
@@ -7910,20 +7953,20 @@ var script = /*#__PURE__*/defineComponent({
 
 
     function _sendItem() {
-      _sendItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
-        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      _sendItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(item) {
+        return _regeneratorRuntime().wrap(function _callee3$(_context3) {
           while (1) {
-            switch (_context2.prev = _context2.next) {
+            switch (_context3.prev = _context3.next) {
               case 0:
                 emit("getItem", JSON.stringify(item));
                 inputV.value = false;
 
               case 2:
               case "end":
-                return _context2.stop();
+                return _context3.stop();
             }
           }
-        }, _callee2);
+        }, _callee3);
       }));
       return _sendItem.apply(this, arguments);
     }
@@ -7988,6 +8031,34 @@ var script = /*#__PURE__*/defineComponent({
         emit("update:show", value);
       }
     });
+    watch(function () {
+      return props.params;
+    }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var _a, _b;
+
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              // 由于打包问题，侦听器一定要在最后，否则找不到getData方法
+              formData.setOfBookId = (_a = props.params.setOfBookId) !== null && _a !== void 0 ? _a : undefined;
+              formData.contractType = (_b = props.params.contractType) !== null && _b !== void 0 ? _b : undefined;
+              getData({
+                params: formData
+              });
+
+            case 3:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2);
+    })));
+    watch(function () {
+      return props;
+    }, function () {
+      console.log(props);
+    });
     return function (_ctx, _cache) {
       var _component_a_input = resolveComponent("a-input");
 

package/packages/ui/dist/index.umd.js

@@ -7794,13 +7794,17 @@
       setOfBookId: {
         type: String,
         required: false
+      },
+      contractType: {
+        type: Number,
+        required: false
       }
     },
     emits: ["update:show", "getItem"],
     setup: function setup(__props, _ref) {
       var emit = _ref.emit;
 
-      var _a;
+      var _a, _b;
 
       var props = __props;
       /**
@@ -7808,7 +7812,8 @@
        * */
 
       var formData = vue.reactive({
-        setOfBookId: (_a = props.params.setOfBookId) !== null && _a !== void 0 ? _a : "",
+        setOfBookId: (_a = props.params.setOfBookId) !== null && _a !== void 0 ? _a : undefined,
+        contractType: (_b = props.params.contractType) !== null && _b !== void 0 ? _b : undefined,
         skipCount: 0,
         maxResultCount: 10,
         key: null
@@ -7842,7 +7847,35 @@
                   _yield$formatHTTP = _context.sent;
                   items = _yield$formatHTTP.items;
                   totalCount = _yield$formatHTTP.totalCount;
-                  dataV.value = items;
+                  dataV.value = items.map(function (item) {
+                    if (item.signStatus == 0) {
+                      item.signStatus = "待开工";
+                    } else if (item.signStatus == 1) {
+                      item.signStatus = "在建";
+                    } else if (item.signStatus == 2) {
+                      item.signStatus = "完工未结算";
+                    } else if (item.signStatus == 4) {
+                      item.signStatus = "完工已结算";
+                    } else if (item.signStatus == 8) {
+                      item.signStatus = "已销项";
+                    } else {
+                      item.signStatus = "暂无";
+                    }
+
+                    if (item.projectStatus == 1) {
+                      item.projectStatus = "待签约";
+                    } else if (item.projectStatus == 2) {
+                      item.projectStatus = "已签约";
+                    } else if (item.projectStatus == 4) {
+                      item.projectStatus = "已完结";
+                    } else if (item.projectStatus == 8) {
+                      item.projectStatus = "诉讼中";
+                    } else {
+                      item.projectStatus = "暂无";
+                    }
+
+                    return item;
+                  });
                   totalPages.value = totalCount;
                   topPages.value = Math.ceil(totalPages.value / formData.maxResultCount);
 
@@ -7871,17 +7904,17 @@
       }, {
         title: "编号",
         w: 104 / 1499 * 100 + "%",
-        key: "projectNumber",
+        key: "serialNumber",
         show: true
       }, {
         title: "合同名称",
         w: 212 / 1499 * 100 + "%",
-        key: "contractName",
+        key: "name",
         show: true
       }, {
         title: "合同简称",
         w: 140 / 1499 * 100 + "%",
-        key: "contractShortName",
+        key: "shortName",
         show: true
       }, {
         title: "账套名称",
@@ -7893,6 +7926,16 @@
         w: 140 / 1499 * 100 + "%",
         key: "setOfBookShortName",
         show: true
+      }, {
+        title: "签署状态",
+        w: 140 / 1499 * 100 + "%",
+        key: "signStatus",
+        show: true
+      }, {
+        title: "项目状态",
+        w: 140 / 1499 * 100 + "%",
+        key: "projectStatus",
+        show: true
       }, {
         title: "",
         w: 45 / 1333 * 100 + "%",
@@ -7914,20 +7957,20 @@
 
 
       function _sendItem() {
-        _sendItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
-          return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        _sendItem = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(item) {
+          return _regeneratorRuntime().wrap(function _callee3$(_context3) {
             while (1) {
-              switch (_context2.prev = _context2.next) {
+              switch (_context3.prev = _context3.next) {
                 case 0:
                   emit("getItem", JSON.stringify(item));
                   inputV.value = false;
 
                 case 2:
                 case "end":
-                  return _context2.stop();
+                  return _context3.stop();
               }
             }
-          }, _callee2);
+          }, _callee3);
         }));
         return _sendItem.apply(this, arguments);
       }
@@ -7992,6 +8035,34 @@
           emit("update:show", value);
         }
       });
+      vue.watch(function () {
+        return props.params;
+      }, /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+        var _a, _b;
+
+        return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+          while (1) {
+            switch (_context2.prev = _context2.next) {
+              case 0:
+                // 由于打包问题，侦听器一定要在最后，否则找不到getData方法
+                formData.setOfBookId = (_a = props.params.setOfBookId) !== null && _a !== void 0 ? _a : undefined;
+                formData.contractType = (_b = props.params.contractType) !== null && _b !== void 0 ? _b : undefined;
+                getData({
+                  params: formData
+                });
+
+              case 3:
+              case "end":
+                return _context2.stop();
+            }
+          }
+        }, _callee2);
+      })));
+      vue.watch(function () {
+        return props;
+      }, function () {
+        console.log(props);
+      });
       return function (_ctx, _cache) {
         var _component_a_input = vue.resolveComponent("a-input");