695593266@qq.com 2 месяцев назад
Родитель
Сommit
e140f98b7a
3 измененных файлов с 20 добавлено и 5 удалено
  1. 3 3
      manifest.json
  2. 13 2
      pages/pda/feeding/bill/index.vue
  3. 4 0
      pages/pda/feeding/components/workOrderBom.vue

+ 3 - 3
manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.3.65",
+    "versionName" : "V1.0.3.66",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {
@@ -10,13 +10,13 @@
             "proxy" : {
                 "/api" : {
                     // "target" : "http://192.168.1.110:18086/",
-                    // "target" : "http://192.168.1.125:18086/",
+                    "target" : "http://192.168.1.125:18086/",
                     // "target" : "http://192.168.1.251:18086/",
                     // "target" : "http://192.168.1.251:18086/",
                     // "target" : "http://110.41.182.105/api/",
                     // "target": "http://116.63.185.248:80/api",
                     // "target" : "http://192.168.1.251:18186/",
-                    "target" : "http://aiot.zoomwin.com.cn:51001/api",
+                    // "target" : "http://aiot.zoomwin.com.cn:51001/api",
                     "changeOrigin" : true,
                     "secure" : false,
                     "pathRewrite" : {

+ 13 - 2
pages/pda/feeding/bill/index.vue

@@ -13,9 +13,9 @@
     <view class="list_box">
       <u-list @scrolltolower="scrolltolower" key="dataList">
         <view class="card_box" v-for="(item, index) in dataList" :key="index">
-          <view class="item_box rx-bc">
+          <view class="item_box rx-bc title_card">
             <view class="round">{{ index + 1 }}</view>
-            <view class="time">投料时间:{{ item.executorTime }} </view>
+            <view>投料时间:{{ item.executorTime }} </view>
           </view>
 
           <view class="item_box rx-bc">
@@ -217,4 +217,15 @@ export default {
     padding: 16rpx 24rpx;
   }
 }
+
+.title_card {
+  height: 90rpx;
+  width: 100%;
+  background: #157a2c;
+  font-size: 24rpx;
+  color: #fff;
+  // line-height: 70rpx;
+  padding: 0 22rpx;
+  box-sizing: border-box;
+}
 </style>

+ 4 - 0
pages/pda/feeding/components/workOrderBom.vue

@@ -404,6 +404,10 @@ export default {
               this.item.executorTime = this.currentExecutorTime;
               // this.item.workReportInfo.executorTime = this.currentExecutorTime;
               this.$set(this.item, "executorTime", this.currentExecutorTime);
+              // 确保 workReportInfo 对象存在后再设置属性
+              if (!this.item.workReportInfo) {
+                this.$set(this.item, "workReportInfo", {});
+              }
               this.$set(
                 this.item.workReportInfo,
                 "executorTime",