Explorar o código

添加出厂编码字段

xiaohaizhao hai 1 día
pai
achega
cac606edbf

+ 8 - 0
.claude/settings.local.json

@@ -0,0 +1,8 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm install *)",
+      "Bash(timeout 30 npm run serve)"
+    ]
+  }
+}

+ 2 - 1
src/HDrpManagement/serveBill/modules/product/add.vue

@@ -134,7 +134,8 @@ export default {
           itemid: item.itemid,
           reason: "",
           qty: 1,
-          traceabilitytype:item.traceabilitytype
+          traceabilitytype:item.traceabilitytype,
+          serial_number: item.serial_number || ""
         };
       });
       let res = await this.$api.requested({

+ 7 - 0
src/HDrpManagement/serveBill/modules/product/index.vue

@@ -64,6 +64,12 @@
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
             {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
+          <div v-else-if="scope.column.columnname == 'serial_number'">
+            <div v-if="currentProduct.sa_serviceorderitemsid == scope.column.data.sa_serviceorderitemsid">
+              <el-input size="mini" v-model="scope.column.data.serial_number"></el-input>
+            </div>
+            <div v-else>{{scope.column.data.serial_number ? scope.column.data.serial_number : '--'}}</div>
+          </div>
           <div v-else-if="scope.column.columnname == 'itemno'">
             {{scope.column.data[scope.column.columnname]}}
             <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
@@ -148,6 +154,7 @@ export default {
               itemid: data.itemid,
               reason: data.reason,
               qty: data.qty,
+              serial_number: data.serial_number || "",
             },
           ],
         },

+ 1 - 0
src/HDrpManagement/serveBill/modules/workBill/add.vue

@@ -128,6 +128,7 @@ export default {
           sa_serviceorderitemsid: 0,
           itemid: item.itemid,
           reason: "",
+          serial_number: item.serial_number || "",
         };
       });
       let res = await this.$api.requested({

+ 1 - 0
src/HDrpManagement/serveBillMag/modules/product/add.vue

@@ -144,6 +144,7 @@ export default {
           itemid: item.itemid,
           reason: "",
           qty: 1,
+          serial_number: item.serial_number || "",
         };
       });
       let res = await this.$api.requested({

+ 8 - 1
src/HDrpManagement/serveBillMag/modules/product/index.vue

@@ -27,6 +27,12 @@
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
             {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
+          <div v-else-if="scope.column.columnname == 'serial_number'">
+            <div v-if="currentProduct.sa_serviceorderitemsid == scope.column.data.sa_serviceorderitemsid">
+              <el-input size="mini" v-model="scope.column.data.serial_number"></el-input>
+            </div>
+            <div v-else>{{scope.column.data.serial_number ? scope.column.data.serial_number : '--'}}</div>
+          </div>
           <div v-else-if="scope.column.columnname == 'itemno'">
             {{scope.column.data[scope.column.columnname]}}
             <div v-if="siteid == 'HY' && scope.column.data.traceabilitytype && scope.column.data.traceabilitytype.length > 0">
@@ -98,7 +104,8 @@ export default {
                   "sa_serviceorderitemsid": data.sa_serviceorderitemsid,
                   "itemid": data.itemid,
                   "qty":data.qty,
-                  "reason": data.reason
+                  "reason": data.reason,
+                  "serial_number": data.serial_number || ""
                 }
             ]
 

+ 1 - 0
src/HDrpManagement/serveBillMag/modules/workBill/add.vue

@@ -128,6 +128,7 @@ export default {
           sa_serviceorderitemsid: 0,
           itemid: item.itemid,
           reason: "",
+          serial_number: item.serial_number || "",
         };
       });
       let res = await this.$api.requested({

+ 6 - 1
src/HDrpManagement/serveWorkBill/modules/Materials/index.vue

@@ -36,6 +36,10 @@
             <el-input v-if="nowRow == scope.column.data.rowindex" v-model="scope.column.data[scope.column.columnname]" :placeholder="$t(`请输入内容`)" size="mini"></el-input>
             <div v-else>{{scope.column.data[scope.column.columnname] || '--'}}</div>
           </div>
+          <div v-else-if="scope.column.columnname === 'serial_number'">
+            <el-input v-if="nowRow == scope.column.data.rowindex" v-model="scope.column.data[scope.column.columnname]" :placeholder="$t(`请输入内容`)" size="mini"></el-input>
+            <div v-else>{{scope.column.data[scope.column.columnname] || '--'}}</div>
+          </div>
           <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname === 'operation' ? scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         <template v-slot:opreation="scope">
@@ -111,7 +115,8 @@ export default {
             "result":data.result,
             "reason":data.reason,
             "qty":data.qty,
-            "itemid":data.itemid
+            "itemid":data.itemid,
+            "serial_number":data.serial_number || ""
           }]
         },
       })

+ 6 - 1
src/HDrpManagement/serveWorkBill/modules/items/index.vue

@@ -38,6 +38,10 @@
             <el-input v-if="nowRow == scope.column.data.rowindex" v-model="scope.column.data[scope.column.columnname]" :placeholder="$t(`请输入内容`)" size="mini"></el-input>
             <div v-else>{{scope.column.data[scope.column.columnname] || '--'}}</div>
           </div>
+          <div v-else-if="scope.column.columnname === 'serial_number'">
+            <el-input v-if="nowRow == scope.column.data.rowindex" v-model="scope.column.data[scope.column.columnname]" :placeholder="$t(`请输入内容`)" size="mini"></el-input>
+            <div v-else>{{scope.column.data[scope.column.columnname] || '--'}}</div>
+          </div>
           <div v-else>{{scope.column.data[scope.column.columnname]||scope.column.columnname === 'operation' ? scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         <template v-slot:opreation="scope">
@@ -160,7 +164,8 @@ export default {
             "result":data.result,
             "reason":data.reason,
             "qty":data.qty,
-            "itemid":data.itemid
+            "itemid":data.itemid,
+            "serial_number":data.serial_number || ""
           }]
         },
       })

+ 2 - 1
src/components/addTable/btnAdd.vue

@@ -265,7 +265,8 @@ export default {
           "result":item.result,
           "reason":item.reason,
           "qty":item.qty || 1,
-          "itemid":item.itemid
+          "itemid":item.itemid,
+          "serial_number":item.serial_number || ""
         }
       })
       const res = await this.$api.requested({