瀏覽代碼

数采更改

qinhb 2 天之前
父節點
當前提交
ec78c5c7d8

+ 2 - 2
src/views/base/craftManagement/route/index.vue

@@ -218,10 +218,10 @@ const startChooseProduct = () => {
 };
 // 已经绑定了工序的可以复制,跟后端HT商量只传id即可。
 const copyRow = (row) => {
-  if (row.usable == 0) {
+  /*if (row.usable == 0) {
     ElMessage.error("该路线未被绑定!");
     return;
-  }
+  }*/
   form.value = Object.assign(form.value, row);
   form.value.processRouteVersion = "";
   crudRef.value.rowAdd();

+ 10 - 4
src/views/pro/traceability/components/collectionCom.vue

@@ -33,7 +33,7 @@
       v-model="updataShow"
       :title="updateTitle"
       @close="closeShow"
-      width="1600"
+      width="80%"
     >
       <avue-crud
         v-model="useCrud2.form"
@@ -193,18 +193,24 @@ useCrud2.value.option = Object.assign(useCrud2.value.option, {
         return dataShow(val.data);
       },
     },
+    {
+      label: "采集时间",
+      prop: "created",
+    },
   ],
 });
 const showLable = (key) => {
   switch (key) {
     case "tipTemperature":
-      return "温度";
+      return "采集温度";
+    case "setTemp":
+      return "设置温度";
     case "CH5Val":
       return "温度";
     case "CH6Val":
       return "湿度";
-    case "DataTimes":
-      return "采集时间";
+    case "weight":
+      return "重量";
     case "torquetarget":
       return "当前任务目标扭力";
     case "tightenTorqueMax":