From 8aa5f0e094e6ff51aa7c47d5b4e8331a16eb09ff Mon Sep 17 00:00:00 2001
From: leiqunqing <zhengqifeng@hnkhzn.com>
Date: 星期五, 06 二月 2026 15:19:05 +0800
Subject: [PATCH] 提交ddl

---
 代码管理/WIDESEAWCS_Client/src/views/basicinfo/formula.vue |  506 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 311 insertions(+), 195 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Client/src/views/basicinfo/formula.vue" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Client/src/views/basicinfo/formula.vue"
index 0967c15..fc822f3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Client/src/views/basicinfo/formula.vue"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WIDESEAWCS_Client/src/views/basicinfo/formula.vue"
@@ -24,147 +24,186 @@
       footer: "Foots",
       cnName: "閰嶆柟淇℃伅",
       name: "formula",
-      url: "/formula/", 
-      sortName: "createDate", 
+      url: "/formula/",
+      sortName: "createDate",
     });
 
+    // 缂栬緫琛ㄥ崟瀛楁 - 鏂板pressFastenTorque锛堝帇瑁呬綅绱у浐鎵煩锛�
     const editFormFields = ref({
       id: "",
-      productCode: "", 
+      productCode: "",
       productName: "",
-      productLength: 0,
-      productWidth: 0,
-      productHeight: 0,
-      screwDownsetDistance: 0,
-      screwTorqueOutput: 0,
-      dintAutoScrewOn: 0,
-      xDirectionDistance1: 0,
-      yDirectionHeight1: 0,
-      xDirectionDistance2: 0,
-      yDirectionHeight2: 0,
-      xDirectionDistance3: 0,
-      yDirectionHeight3: 0,
-});
-    
+      productLength: "",
+      productWidth: "",
+      productHeight: "",
+      pressNoTighten: "",
+      screwDownsetDistance: "",
+      screwTorqueOutput: "",
+      pressFastenTorque: "", // 銆愭柊澧炪�戝帇瑁呬綅绱у浐鎵煩
+      dintAutoScrewOn: "",
+      p0P1Width: "",
+      p0P2Width: "",
+      p0P3Width: "",
+      p1P3Height: "",
+      p2P3Height: "",
+      productImagePath: "",
+    });
+
+    // 缂栬緫琛ㄥ崟閰嶇疆-鏂板鍘嬭浣嶇揣鍥烘壄鐭╋紝甯冨眬閫傞厤鍘熸湁绱у噾鎬�
     const editFormOptions = ref([
+      // 绗竴琛岋細鍩虹鏍囪瘑
       [
         {
           title: "鎴愬搧缂栧彿",
           field: "productCode",
           type: "input",
           width: 200,
-          require: true
+          require: true,
         },
         {
           title: "鎴愬搧鍚嶇О",
           field: "productName",
           type: "input",
           width: 200,
-          require: true
+          require: true,
         },
         {
-          title: "鍘嬭浣嶄骇鍝侀暱搴�",
-          field: "productLength",
-          type: "number",
-          width: 200,
-          require: false
-        }
-      ],
-      [
-        {
-          title: "鍘嬭浣嶄骇鍝佸搴�",
-          field: "productWidth",
-          type: "number",
-          width: 200,
-          require: false
-        },
-        {
-          title: "鍘嬭浣嶄骇鍝侀珮搴�",
-          field: "productHeight",
-          type: "number",
-          width: 200,
-          require: false
-        },
-        {
-          title: "鍘嬭浣嶆嫥绱т笅闄嶉珮搴�",
-          field: "screwDownsetDistance",
-          type: "number",
-          width: 200,
-          require: false
-        }
-      ],
-      [
-        {
-          title: "鍘嬭浣嶆嫥绱ф壄鍔�",
-          field: "screwTorqueOutput",
-          type: "number",
-          width: 200,
-          require: false
-        },
-        {
-          title: "鍘嬭浣嶈嚜鍔ㄦ嫥绱ф墦寮�",
+          title: "鎷х揣绋嬪簭鍙�",
           field: "dintAutoScrewOn",
-          type: "number",
-          width: 200,
-          require: false
-        },
-        {
-          title: "妫�娴嬩綅X鍋忕Щ璺濈1",
-          field: "xDirectionDistance1",
-          type: "number",
-          width: 200,
-          require: false
-        }
-      ],
-      [
-        {
-          title: "妫�娴嬩綅Z楂樺害1",
-          field: "yDirectionHeight1",
-          type: "number",
-          width: 200,
-          require: false
-        },
-        {
-          title: "妫�娴嬩綅X鍋忕Щ璺濈2",
-          field: "xDirectionDistance2",
-          type: "number",
-          width: 200,
-          require: false
-        },
-        {
-          title: "妫�娴嬩綅Z楂樺害2",
-          field: "yDirectionHeight2",
-          type: "number",
-          width: 200,
-          require: false
-        }
-      ],
-      [
-        {
-          title: "妫�娴嬩綅X鍋忕Щ璺濈3",
-          field: "xDirectionDistance3",
-          type: "number",
-          width: 200,
-          require: false
-        },
-        {
-          title: "妫�娴嬩綅Z楂樺害3",
-          field: "yDirectionHeight3",
-          type: "number",
-          width: 200,
-          require: false
-        },
-        {
-          title: "涓婚敭ID",
-          field: "id",
           type: "input",
-          width: 100,
-          hidden: true,
-          readonly: true
-        }
-      ]
+          inputType: "number",
+          width: 180,
+          placeholder: "璇疯緭鍏ユ暣鏁�",
+        },
+        {
+          title: "浜у搧闀垮害",
+          field: "productLength",
+          type: "input",
+          inputType: "number",
+          width: 120,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+      ],
+      [
+        {
+          title: "浜у搧瀹藉害",
+          field: "productWidth",
+          type: "input",
+          inputType: "number",
+          width: 120,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+        {
+          title: "浜у搧楂樺害",
+          field: "productHeight",
+          type: "input",
+          inputType: "number",
+          width: 120,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+        {
+          title: "鍘嬭浣嶄笉鎷х揣",
+          field: "pressNoTighten",
+          type: "select",
+          width: 120,
+          align: "center",
+          data: [
+            { key: "0", value: "鍚�" },
+            { key: "1", value: "鏄�" },
+          ],
+        },
+        {
+          title: "淇濆帇鍘嬪姏",
+          field: "screwDownsetDistance",
+          type: "input",
+          inputType: "number",
+          width: 150,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+      ],
+      [
+        {
+          title: "涓績楂樺害",
+          field: "screwTorqueOutput",
+          type: "input",
+          inputType: "number",
+          width: 120,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+        {
+          title: "绱у浐鎵煩",
+          field: "pressFastenTorque",
+          type: "input",
+          inputType: "number",
+          width: 150,
+          placeholder: "淇濈暀2浣嶅皬鏁帮紝榛樿0.00",
+          attrs: { step: 0.01, min: 0 },
+        },
+        {
+          title: "P0P1瀹藉害",
+          field: "p0P1Width",
+          type: "input",
+          inputType: "number",
+          width: 120,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+        {
+          title: "P0P2瀹藉害",
+          field: "p0P2Width",
+          type: "input",
+          inputType: "number",
+          width: 120,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+      ],
+      // 绗洓琛岋細P绯诲垪楂樺害 + 浜у搧鍥剧墖璺緞
+      [
+        {
+          title: "P0P3瀹藉害",
+          field: "p0P3Width",
+          type: "input",
+          inputType: "number",
+          width: 120,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+        {
+          title: "P1P3楂樺害",
+          field: "p1P3Height",
+          type: "input",
+          inputType: "number",
+          width: 150,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+        {
+          title: "P2P3楂樺害",
+          field: "p2P3Height",
+          type: "input",
+          inputType: "number",
+          width: 150,
+          placeholder: "淇濈暀2浣嶅皬鏁�",
+          attrs: { step: 0.01, min: 0 },
+        },
+        {
+          title: "浜у搧鍥剧墖璺緞",
+          field: "productImagePath",
+          type: "textarea",
+          width: 400,
+          rows: 2,
+          placeholder: "璇疯緭鍏ュ浘鐗囧畬鏁磋矾寰勶紝鏀寔500瀛楃浠ュ唴",
+        },
+      ],
     ]);
 
+    // 鎼滅储琛ㄥ崟瀛楁 - 鏃犻渶淇敼
     const searchFormFields = ref({
       productCode: "",
       productName: "",
@@ -172,162 +211,239 @@
       createDate: "",
     });
 
+    // 鎼滅储琛ㄥ崟閰嶇疆 - 鏃犻渶淇敼
     const searchFormOptions = ref([
       [
-        { title: "鎴愬搧缂栧彿", field: "productCode", type: "like" },
-        { title: "鎴愬搧鍚嶇О", field: "productName", type: "like" },
+        { title: "鎴愬搧缂栧彿", field: "productCode", type: "like", width: 200 },
+        { title: "鎴愬搧鍚嶇О", field: "productName", type: "like", width: 200 },
       ],
       [
-        { title: "鍒涘缓浜�", field: "creater", type: "like" },
-        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime" },
+        { title: "鍒涘缓浜�", field: "creater", type: "like", width: 200 },
+        { title: "鍒涘缓鏃堕棿", field: "createDate", type: "datetime", width: 380 },
       ],
     ]);
 
+    // 琛ㄦ牸鍒楅厤缃� - 鏂板鍘嬭浣嶇揣鍥烘壄鐭╁垪
     const columns = ref([
       {
         field: "id",
         title: "搴忓彿",
         type: "int",
-        width: 90,
+        width: 80,
         hidden: true,
-        readonly: true,
-        require: true,
-        align: "left",
+        align: "center",
       },
       {
         field: "productCode",
         title: "鎴愬搧缂栧彿",
         type: "string",
-        width: 200,
+        link: true,
+        width: 150,
         align: "left",
       },
       {
         field: "productName",
         title: "鎴愬搧鍚嶇О",
         type: "string",
-        width: 200,
+        width: 150,
         align: "left",
       },
       {
         field: "productLength",
-        title: "鍘嬭浣嶄骇鍝侀暱搴�",
-        type: "float",
-        width: 200,
-        align: "left",
+        title: "浜у搧闀垮害",
+        type: "decimal",
+        width: 90,
+        align: "center",
       },
       {
         field: "productWidth",
-        title: "鍘嬭浣嶄骇鍝佸搴�",
-        type: "float",
-        width: 200,
-        align: "left",
+        title: "浜у搧瀹藉害",
+        type: "decimal",
+        width: 90,
+        align: "center",
       },
       {
         field: "productHeight",
-        title: "鍘嬭浣嶄骇鍝侀珮搴�",
-        type: "float",
-        width: 200,
-        align: "left",
+        title: "浜у搧楂樺害",
+        type: "decimal",
+        width: 90,
+        align: "center",
+      },
+      {
+        field: "pressNoTighten",
+        title: "鍘嬭浣嶄笉鎷х揣",
+        type: "select",
+        width: 100,
+        align: "center",
+        bind: {
+          key: "value",
+          data: [
+            { key: "0", value: "鍚�" },
+            { key: "1", value: "鏄�" },
+          ],
+        },
       },
       {
         field: "screwDownsetDistance",
-        title: "鍘嬭浣嶆嫥绱т笅闄嶉珮搴�",
-        type: "float",
-        width: 200,
-        align: "left",
+        title: "淇濆帇鍘嬪姏",
+        type: "decimal",
+        width: 110,
+        align: "center",
       },
       {
         field: "screwTorqueOutput",
-        title: "鍘嬭浣嶆嫥绱ф壄鍔�",
-        type: "float",
-        width: 200,
-        align: "left",
+        title: "涓績楂樺害",
+        type: "decimal",
+        width: 90,
+        align: "center",
+      },
+      {
+        field: "pressFastenTorque", // 銆愭柊澧炪�戣〃鏍煎垪
+        title: "鍘嬭浣嶇揣鍥烘壄鐭�",
+        type: "decimal",
+        width: 120,
+        align: "center",
       },
       {
         field: "dintAutoScrewOn",
-        title: "鍘嬭浣嶈嚜鍔ㄦ嫥绱ф墦寮�",
+        title: "鎷х揣绋嬪簭鍙�",
         type: "int",
-        width: 200,
-        align: "left",
+        width: 100,
+        align: "center",
+      },
+      // P绯诲垪瀹藉害
+      {
+        field: "p0P1Width",
+        title: "P0P1瀹藉害",
+        type: "decimal",
+        width: 90,
+        align: "center",
       },
       {
-        field: "xDirectionDistance1",
-        title: "妫�娴嬩綅X鍋忕Щ璺濈1",
-        type: "float",
-        width: 200,
-        align: "left",
+        field: "p0P2Width",
+        title: "P0P2瀹藉害",
+        type: "decimal",
+        width: 90,
+        align: "center",
       },
       {
-        field: "yDirectionHeight1",
-        title: "妫�娴嬩綅Z楂樺害1",
-        type: "float",
-        width: 200,
-        align: "left",
+        field: "p0P3Width",
+        title: "P0P3瀹藉害",
+        type: "decimal",
+        width: 90,
+        align: "center",
+      },
+      // P绯诲垪楂樺害
+      {
+        field: "p1P3Height",
+        title: "P1P3楂樺害",
+        type: "decimal",
+        width: 90,
+        align: "center",
       },
       {
-        field: "xDirectionDistance2",
-        title: "妫�娴嬩綅X鍋忕Щ璺濈2",
-        type: "float",
-        width: 200,
-        align: "left",
+        field: "p2P3Height",
+        title: "P2P3楂樺害",
+        type: "decimal",
+        width: 90,
+        align: "center",
       },
       {
-        field: "yDirectionHeight2",
-        title: "妫�娴嬩綅Z楂樺害2",
-        type: "float",
+        field: "productImagePath",
+        title: "鍥剧墖璺緞",
+        type: "string",
         width: 200,
         align: "left",
+        overflow: "ellipsis",
       },
-      {
-        field: "xDirectionDistance3",
-        title: "妫�娴嬩綅X鍋忕Щ璺濈3",
-        type: "float",
-        width: 200,
-        align: "left",
-      },
-      {
-        field: "yDirectionHeight3",
-        title: "妫�娴嬩綅Z楂樺害3",
-        type: "float",
-        width: 200,
-        align: "left",
-      },
+      // 鍏叡瀛楁
       {
         field: "creater",
         title: "鍒涘缓浜�",
         type: "string",
-        width: 90,
-        align: "left",
+        width: 80,
+        align: "center",
       },
       {
         field: "createDate",
         title: "鍒涘缓鏃堕棿",
         type: "datetime",
-        width: 150,
-        align: "left",
+        width: 160,
+        align: "center",
       },
       {
         field: "modifier",
         title: "淇敼浜�",
         type: "string",
-        width: 100,
-        align: "left",
+        width: 80,
+        align: "center",
       },
       {
         field: "modifyDate",
         title: "淇敼鏃堕棿",
         type: "datetime",
         width: 160,
-        align: "left",
+        align: "center",
       },
     ]);
 
+    // 閰嶆柟鏄庣粏閰嶇疆 - 鏃犻渶淇敼
     const detail = ref({
-      cnName: "",
-      table: "",
-      columns: [],
-      sortName: "",
-      key: "",
+      cnName: "閰嶆柟淇℃伅璇︽儏",
+      table: "FormulaDetail",
+      columns: [
+        {
+          field: "formulaId",
+          title: "閰嶆柟ID",
+          type: "int",
+          width: 90,
+          hidden: true,
+          readonly: true,
+          require: true,
+          align: "center",
+        },
+        {
+          field: "componentCode",
+          title: "闆朵欢缂栧彿",
+          type: "string",
+          edit: { type: "" },
+          width: 120,
+          require: true,
+          align: "left",
+        },
+        {
+          field: "componentName",
+          title: "闆朵欢鍚嶇О",
+          type: "string",
+          edit: { type: "" },
+          width: 150,
+          align: "left",
+        },
+        {
+          field: "supplierCode",
+          title: "渚涙柟浠g爜",
+          type: "string",
+          edit: { type: "" },
+          width: 150,
+          align: "left",
+        },
+        {
+          title: "鏄惁鎵爜",
+          field: "isScanned",
+          type: "select",
+          width: 100,
+          align: "center",
+          bind: {
+            key: "value",
+            data: [
+              { key: "0", value: "鍚�" },
+              { key: "1", value: "鏄�" },
+            ],
+          },
+        },
+      ],
+      sortName: "createDate",
+      key: "id",
     });
 
     return {
@@ -342,4 +458,4 @@
     };
   },
 });
-</script>
\ No newline at end of file
+</script>

--
Gitblit v1.9.3