Bladeren bron

fix: 更新版本号至V1.0.3.42,优化设备名称显示样式,修复质检报工页面数据初始化问题

yusheng 7 maanden geleden
bovenliggende
commit
c7f88c2373

+ 3 - 3
manifest.json

@@ -2,7 +2,7 @@
     "name" : "智慧工厂",
     "appid" : "__UNI__45B3907",
     "description" : "",
-    "versionName" : "V1.0.3.41",
+    "versionName" : "V1.0.3.42",
     "versionCode" : "100",
     "transformPx" : false,
     "h5" : {
@@ -11,8 +11,8 @@
                 "/api" : {
                     // "target" : "http://192.168.1.110:18086/",
                     // "target" : "http://192.168.1.251:18086/",
-                    // "target" : "http://192.168.1.251: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",
                     "changeOrigin" : true,
                     "secure" : false,

+ 380 - 322
pages/index/index.vue

@@ -1,33 +1,49 @@
 <template>
-	<view>
-		<uni-nav-bar fixed="true" statusBar="true" title="工作台" right-icon="scan"
-			@clickRight="HandlScanCode"></uni-nav-bar>
-		<view>
-			<CellTip title="协同办公" v-if="internalManagementList.length > 0"></CellTip>
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in internalManagementList" @click="toNav(item.path)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
-						<label>{{ item.name }}</label>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view>
-			<CellTip title="生产管理" v-if="productionList.length > 0"></CellTip>
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="item in productionList" :key="item.link_url"
-						@click="toNav(item.path)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<label>{{ item.title }}</label>
-						<label>{{ item.num }}</label>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!-- <view>
+  <view>
+    <uni-nav-bar
+      fixed="true"
+      statusBar="true"
+      title="工作台"
+      right-icon="scan"
+      @clickRight="HandlScanCode"
+    ></uni-nav-bar>
+    <view>
+      <CellTip
+        title="协同办公"
+        v-if="internalManagementList.length > 0"
+      ></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in internalManagementList"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <i class="badge" v-if="item.badge">{{ item.badge }}</i>
+            <label>{{ item.name }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view>
+      <CellTip title="生产管理" v-if="productionList.length > 0"></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="item in productionList"
+            :key="item.link_url"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <label>{{ item.title }}</label>
+            <label>{{ item.num }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!-- <view>
       <CellTip title="生产执行"></CellTip>
       <view class="nav">
         <view class="nav-content">
@@ -43,104 +59,152 @@
         </view>
       </view>
     </view> -->
-		<view>
-			<CellTip title="运维管理" v-if="operationsList.length > 0"></CellTip>
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in operationsList" @click="toNav(item.path)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
-						<label>{{ item.name }}</label>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view>
-			<CellTip title="售后服务管理" v-if="serviceList.length > 0"></CellTip>
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in serviceList" @click="toNav(item.path)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
-						<label>{{ item.name }}</label>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view>
-			<CellTip title="仓储管理" v-if="warehousingList.length > 0"></CellTip>
+    <view>
+      <CellTip title="运维管理" v-if="operationsList.length > 0"></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in operationsList"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <i class="badge" v-if="item.badge">{{ item.badge }}</i>
+            <label>{{ item.name }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view>
+      <CellTip title="售后服务管理" v-if="serviceList.length > 0"></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in serviceList"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <i class="badge" v-if="item.badge">{{ item.badge }}</i>
+            <label>{{ item.name }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view>
+      <CellTip title="仓储管理" v-if="warehousingList.length > 0"></CellTip>
 
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in warehousingList" @click="toNav(item.path)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<label>{{ item.title }}</label>
-						<!-- <label>{{ item.num }}</label> -->
-					</view>
-				</view>
-			</view>
-		</view>
-		<view>
-			<CellTip title="运输管理" v-if="dispatchList.length > 0"></CellTip>
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in dispatchList" @click="toNav(item.url)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
-						<label>{{ item.name }}</label>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view>
-			<CellTip title="营销管理" v-if="saleManageList.length > 0"></CellTip>
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in saleManageList" @click="toNav(item.path)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
-						<label>{{ item.name }}</label>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view>
-			<CellTip title="采购管理" v-if="purchaseManageList.length > 0"></CellTip>
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in purchaseManageList" @click="toNav(item.path)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
-						<label>{{ item.name }}</label>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view>
-			<CellTip title="质量管理" v-if="qmsList.length > 0"></CellTip>
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in qmsList" @click="toNav(item.path)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
-						<label>{{ item.name }}</label>
-					</view>
-				</view>
-			</view>
-		</view>
-		<view>
-			<CellTip title="溯源管理" v-if="traceabilityList.length > 0"></CellTip>
-			<view class="nav">
-				<view class="nav-content">
-					<view class="nav-item" v-for="(item, index) in traceabilityList" @click="toNav(item.path)">
-						<span :class="'iconfont ' + item.icon"></span>
-						<i class="badge" v-if="item.badge">{{ item.badge }}</i>
-						<label>{{ item.name }}</label>
-					</view>
-				</view>
-			</view>
-		</view>
-		<!--    <view>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in warehousingList"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <label>{{ item.title }}</label>
+            <!-- <label>{{ item.num }}</label> -->
+          </view>
+        </view>
+      </view>
+    </view>
+    <view>
+      <CellTip title="运输管理" v-if="dispatchList.length > 0"></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in dispatchList"
+            @click="toNav(item.url)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <i class="badge" v-if="item.badge">{{ item.badge }}</i>
+            <label>{{ item.name }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view>
+      <CellTip title="营销管理" v-if="saleManageList.length > 0"></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in saleManageList"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <i class="badge" v-if="item.badge">{{ item.badge }}</i>
+            <label>{{ item.name }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view>
+      <CellTip title="采购管理" v-if="purchaseManageList.length > 0"></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in purchaseManageList"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <i class="badge" v-if="item.badge">{{ item.badge }}</i>
+            <label>{{ item.name }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view>
+      <CellTip title="生产管控" v-if="pcsList.length > 0"></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in pcsList"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <i class="badge" v-if="item.badge">{{ item.badge }}</i>
+            <label>{{ item.name }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view>
+      <CellTip title="质量管理" v-if="qmsList.length > 0"></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in qmsList"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <i class="badge" v-if="item.badge">{{ item.badge }}</i>
+            <label>{{ item.name }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <view>
+      <CellTip title="溯源管理" v-if="traceabilityList.length > 0"></CellTip>
+      <view class="nav">
+        <view class="nav-content">
+          <view
+            class="nav-item"
+            v-for="(item, index) in traceabilityList"
+            @click="toNav(item.path)"
+          >
+            <span :class="'iconfont ' + item.icon"></span>
+            <i class="badge" v-if="item.badge">{{ item.badge }}</i>
+            <label>{{ item.name }}</label>
+          </view>
+        </view>
+      </view>
+    </view>
+    <!--    <view>
       <CellTip title="生产类"></CellTip>
 
       <view class="nav">
@@ -157,208 +221,202 @@
         </view>
       </view>
     </view> -->
-	</view>
+  </view>
 </template>
 
 <script>
-	import CellTip from '@/components/CellTip.vue'
-	import {
-		statistics
-	} from '@/api/myTicket'
-	export default {
-		components: {
-			CellTip
-		},
-		data() {
-			return {
-				timer: null,
-				src1: 'https://cdn.uviewui.com/uview/album/1.jpg',
-				workOrder: {}, // 工单统计数据
-				qmsList: [],
-				//生产类
-				productionList: [],
-				// executeList: [
-				//   {
-				//     class: "iconfont icon-gongdanguanli",
-				//     title: "成型",
-				//     link_url: "/pages/production/execute/extrusion/index",
-				//     // "num": 1
-				//   },
-				//   {
-				//     class: "iconfont icon-gongdanguanli",
-				//     title: "自然干燥",
-				//     link_url: "/pages/production/execute/drying/index",
-				//     // "num": 1
-				//   },
-				//   {
-				//     class: "iconfont icon-gongdanguanli",
-				//     title: "升温干燥",
-				//     link_url: "/pages/production/execute/heating/index",
-				//     // "num": 1
-				//   },
-				//   {
-				//     class: "iconfont icon-gongdanguanli",
-				//     title: "半加定长",
-				//     link_url: "/pages/production/execute/halfAdded/index",
-				//     // "num": 1
-				//   },
-				//   // {
-				//   //   class: "iconfont icon-gongdanguanli",
-				//   //   title: "领料",
-				//   //   link_url: "/pages/production/execute/picking/index",
-				//   //   // "num": 1
-				//   // },
-				// ],
-				//仓储管理
-
-				warehousingList: [
-
-				],
-
-				//运维类
-				operationsList: [
-
-				],
-				dispatchList: [
-
-				],
-				internalManagementList: [
-
-				],
-				treeList: [],
-				saleManageList: [],
-				// 售后服务
-				serviceList: [],
-				// 溯源管理
-				traceabilityList: [],
-				// 采购管理
-				purchaseManageList: [],
-			}
-		},
-		created() {
-			this.getTree()
-		},
-		onShow() {
-			this.getStatistics()
-		},
-		onHide() {
-			clearTimeout(this.timer);
-		},
-		onUnload() {
-			clearTimeout(this.timer);
-		},
-		methods: {
-			getStatistics() {
-				// 获取工单统计数
-				statistics().then((res) => {
-					this.workOrder = res
-					console.log('this.operationsList---', this.operationsList)
-					console.log('res', res)
-					this.operationsList.forEach(item => {
-						if (item.name == '保养工单') item.badge = res.maintenanceNum
-						if (item.name == '巡点检工单') item.badge = res.patrolInspection
-						if (item.name == '维修工单') item.badge = res.repairsNum
-					})
-				}).finally(() => {
-					this.timer = setTimeout(() => {
-						this.getStatistics()
-					}, 12000)
-				})
-			},
-			getTree() {
-				let _list = uni.getStorageSync('treeList')
-				let list = JSON.parse(_list) || []
-				console.log('-----------list--------------')
-				console.log(list)
-				if (list[0] && list[0].children.length > 0) {
-					console.log(list[0].children, 'list[0].children ----')
-					list[0].children.forEach(f => {
-						if (f.path == 'productionManage') {
-							this.productionList = f.children
-						} else if (f.path == 'operationsList') {
-							statistics().then(res => {
-								this.workOrder = res
-								console.log('this.operationsList---', this.operationsList)
-								console.log('res', res)
-								f.children.forEach(item => {
-									if (item.name == '保养工单') item.badge = res.maintenanceNum
-									if (item.name == '巡点检工单') item.badge = res.patrolInspection
-									if (item.name == '维修工单') item.badge = res.repairsNum
-								})
-								this.operationsList = f.children
-							})
-						} else if (f.path == 'warehouseManagement') {
-							this.warehousingList = f.children
-						} else if (f.path == 'saleManageList') {
-							this.saleManageList = f.children
-							this.saleManageList.forEach(item => {
-								item.name = item.name.replace('员工', '')
-								item.name = item.name.replace('管理员', '')
-							})
-						} else if (f.path == 'internalManagement') {
-							console.log(f, 'f')
-							this.internalManagementList = f.children
+import CellTip from "@/components/CellTip.vue";
+import { statistics } from "@/api/myTicket";
+export default {
+  components: {
+    CellTip,
+  },
+  data() {
+    return {
+      timer: null,
+      src1: "https://cdn.uviewui.com/uview/album/1.jpg",
+      workOrder: {}, // 工单统计数据
+      qmsList: [],
+      //生产类
+      productionList: [],
+      // executeList: [
+      //   {
+      //     class: "iconfont icon-gongdanguanli",
+      //     title: "成型",
+      //     link_url: "/pages/production/execute/extrusion/index",
+      //     // "num": 1
+      //   },
+      //   {
+      //     class: "iconfont icon-gongdanguanli",
+      //     title: "自然干燥",
+      //     link_url: "/pages/production/execute/drying/index",
+      //     // "num": 1
+      //   },
+      //   {
+      //     class: "iconfont icon-gongdanguanli",
+      //     title: "升温干燥",
+      //     link_url: "/pages/production/execute/heating/index",
+      //     // "num": 1
+      //   },
+      //   {
+      //     class: "iconfont icon-gongdanguanli",
+      //     title: "半加定长",
+      //     link_url: "/pages/production/execute/halfAdded/index",
+      //     // "num": 1
+      //   },
+      //   // {
+      //   //   class: "iconfont icon-gongdanguanli",
+      //   //   title: "领料",
+      //   //   link_url: "/pages/production/execute/picking/index",
+      //   //   // "num": 1
+      //   // },
+      // ],
+      //仓储管理
 
-						} else if (f.path == 'serviceList') {
-							this.serviceList = f.children;
-						} else if (f.path == 'traceability') {
-							this.traceabilityList = f.children;
-						} else if (f.path == 'purchasingManage') {
-							this.purchaseManageList = f.children;
-						} else if (f.path == 'qualityManage') {
-							this.qmsList = f.children;
-						}
+      warehousingList: [],
 
-					})
-				}
-			},
+      //运维类
+      operationsList: [],
+      dispatchList: [],
+      internalManagementList: [],
+      treeList: [],
+      saleManageList: [],
+      // 售后服务
+      serviceList: [],
+      // 溯源管理
+      traceabilityList: [],
+      // 采购管理
+      purchaseManageList: [],
+	  pcsList:[]
+    };
+  },
+  created() {
+    this.getTree();
+  },
+  onShow() {
+    this.getStatistics();
+  },
+  onHide() {
+    clearTimeout(this.timer);
+  },
+  onUnload() {
+    clearTimeout(this.timer);
+  },
+  methods: {
+    getStatistics() {
+      // 获取工单统计数
+      statistics()
+        .then((res) => {
+          this.workOrder = res;
+          console.log("this.operationsList---", this.operationsList);
+          console.log("res", res);
+          this.operationsList.forEach((item) => {
+            if (item.name == "保养工单") item.badge = res.maintenanceNum;
+            if (item.name == "巡点检工单") item.badge = res.patrolInspection;
+            if (item.name == "维修工单") item.badge = res.repairsNum;
+          });
+        })
+        .finally(() => {
+          this.timer = setTimeout(() => {
+            this.getStatistics();
+          }, 12000);
+        });
+    },
+    getTree() {
+      let _list = uni.getStorageSync("treeList");
+      let list = JSON.parse(_list) || [];
+      console.log("-----------list--------------");
+      console.log(list);
+      if (list[0] && list[0].children.length > 0) {
+        console.log(list[0].children, "list[0].children ----");
+        list[0].children.forEach((f) => {
+          if (f.path == "productionManage") {
+            this.productionList = f.children;
+          } else if (f.path == "operationsList") {
+            statistics().then((res) => {
+              this.workOrder = res;
+              console.log("this.operationsList---", this.operationsList);
+              console.log("res", res);
+              f.children.forEach((item) => {
+                if (item.name == "保养工单") item.badge = res.maintenanceNum;
+                if (item.name == "巡点检工单")
+                  item.badge = res.patrolInspection;
+                if (item.name == "维修工单") item.badge = res.repairsNum;
+              });
+              this.operationsList = f.children;
+            });
+          } else if (f.path == "warehouseManagement") {
+            this.warehousingList = f.children;
+          } else if (f.path == "saleManageList") {
+            this.saleManageList = f.children;
+            this.saleManageList.forEach((item) => {
+              item.name = item.name.replace("员工", "");
+              item.name = item.name.replace("管理员", "");
+            });
+          } else if (f.path == "internalManagement") {
+            console.log(f, "f");
+            this.internalManagementList = f.children;
+          } else if (f.path == "serviceList") {
+            this.serviceList = f.children;
+          } else if (f.path == "traceability") {
+            this.traceabilityList = f.children;
+          } else if (f.path == "purchasingManage") {
+            this.purchaseManageList = f.children;
+          } else if (f.path == "qualityManage") {
+            this.qmsList = f.children;
+          } else if (f.path == "productionControlManagement") {
+            this.pcsList = f.children;
+          }
+        });
+      }
+    },
 
-			toNav(url) {
-				console.log(url)
-				uni.navigateTo({
-					url: url
-				})
-			},
-			HandlScanCode() {
-				let _this = this
-				uni.scanCode({
-					success: function(res) {
-						console.log(res)
-						// 获取扫描结果中的URL
-						const scanResult = res.result
-						// 检查URL是否包含traceability
-						if (scanResult && scanResult.includes('/traceability')) {
-							// 从扫描结果中提取id参数
-							let id = ''
-							if (scanResult.includes('id=')) {
-								// 分割URL获取id参数值
-								const idPart = scanResult.split('id=')[1]
-								// 如果id后面还有其他参数,只取到第一个&之前的部分
-								if (idPart.includes('&')) {
-									id = idPart.split('&')[0]
-								} else {
-									id = idPart
-								}
-							}
-							// 跳转到溯源页面并传递id
-							uni.navigateTo({
-								url: `/pages/traceability/scanCode/index?id=${id}`
-							})
-							return
-						}
-						_this.scantoRouter(scanResult)
-					}
-				})
-			},
-			scantoRouter(result) {
-				uni.navigateTo({
-					url: `/pages/pda/workOrder/extrusionMolding/index?id=${result}`
-				})
-			}
-		}
-	}
+    toNav(url) {
+      console.log(url);
+      uni.navigateTo({
+        url: url,
+      });
+    },
+    HandlScanCode() {
+      let _this = this;
+      uni.scanCode({
+        success: function (res) {
+          console.log(res);
+          // 获取扫描结果中的URL
+          const scanResult = res.result;
+          // 检查URL是否包含traceability
+          if (scanResult && scanResult.includes("/traceability")) {
+            // 从扫描结果中提取id参数
+            let id = "";
+            if (scanResult.includes("id=")) {
+              // 分割URL获取id参数值
+              const idPart = scanResult.split("id=")[1];
+              // 如果id后面还有其他参数,只取到第一个&之前的部分
+              if (idPart.includes("&")) {
+                id = idPart.split("&")[0];
+              } else {
+                id = idPart;
+              }
+            }
+            // 跳转到溯源页面并传递id
+            uni.navigateTo({
+              url: `/pages/traceability/scanCode/index?id=${id}`,
+            });
+            return;
+          }
+          _this.scantoRouter(scanResult);
+        },
+      });
+    },
+    scantoRouter(result) {
+      uni.navigateTo({
+        url: `/pages/pda/workOrder/extrusionMolding/index?id=${result}`,
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	@import 'index.scss';
-</style>
+@import "index.scss";
+</style>

+ 12 - 1
pages/maintenance/order/OrderTask.vue

@@ -16,7 +16,7 @@
 						<view class="item_box rx-bc">
 							<view class="item_one perce50 rx-sc">
 								<view class="lable">设备名称:</view>
-								<view>{{item.deviceName}}</view>
+								<view class="deviceName">{{item.deviceName}}</view>
 							</view>
 						</view>
 						<view class="item_box rx-bc">
@@ -160,6 +160,17 @@
 				font-weight: 400;
 				line-height: 38rpx;
 				word-wrap: break-word;
+				.lable {
+					width: 150rpx;
+				}
+				
+				.deviceName {
+					width: calc(750rpx - 150rpx);
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+				}
 			}
 
 			.gylx {

+ 1 - 1
pages/maintenanceWorkorder/components/maintain_course.vue

@@ -44,7 +44,7 @@
 							<view class="label">验收结果</view>
 							<view class="value">
 								{{ logs[item.id] ? (logs[item.id].content.orderStatus == 4 ? '通过' : '驳回') : '' }}
-							</view>WXGD2025022715
+							</view>
 						</view>
 					</view>
 					<view class="list-xs" v-else-if="item.type == 'WORK_REPORT'">

+ 2 - 2
pages/qms/inspectionWork/index.vue

@@ -13,7 +13,7 @@
 		<div style="height:100rpx;width: 475rpx;"></div>
 		<view class="wrapper">
 			<u-list @scrolltolower="scrolltolower" class="listContent">
-				<view v-for="(item, index) in tableList" :key="item.id" style="position: relative;">
+				<view v-for="(item, index) in tableList" :key="index+item.id" style="position: relative;">
 					<view class="item">
 						<view class="herder_item">
 							<view class="herder_text"></view>
@@ -24,7 +24,7 @@
 						<view class="text">检验项目:</view>
 						<view class="item_value">
 							<view @click="goTo(item.id,row.id)" v-for="(row,_index) in item.templateList"
-								:key="index+'_'+_index"
+								:key="item.inspectionName+index+'_'+_index"
 								:style="{background:row.status==1?'#19be6b':row.status==2?'#ff9900':row.status==3?'#ff9900':'#909399'}">
 								{{row.inspectionName}}
 							</view>

+ 15 - 9
pages/qms/inspectionWork/inspectionProjectReport.vue

@@ -171,7 +171,13 @@
 				handleInput,
 				show: false,
 				form: {
-
+					lossNumber: '',
+					lossNumberUnqualified: '',
+					retainedSampleQuantity: '',
+					retainedSampleUnqualified: '',
+					qualifiedQuantity:'',
+					noQualifiedQuantity:'',
+					sampleQuantity:'',
 				},
 				acceptUnpackList: [{
 						text: "合格",
@@ -199,7 +205,7 @@
 			if (data) {
 				getById(data.workId).then(res => {
 					this.workData = res
-					this.form = res.templateList.find(item => item.id == data.projectId)
+					this.$set(this,'form',res.templateList.find(item => item.id == data.projectId))
 					this.form.measureUnit = res.qualitySampleList[0]?.measureUnit
 
 				})
@@ -248,15 +254,14 @@
 			valueInit(data) {
 				['lossNumber', 'lossNumberUnqualified', 'retainedSampleQuantity', 'retainedSampleUnqualified'].forEach(
 					key => {
-						data[key] = 0
+						data[key] = ''
 					})
 			},
 
 			inputValue(type) {
-				console.log(type, 'type')
 				let data = JSON.parse(JSON.stringify((this.form)))
 				if (data[type] < 0) {
-					data[type] = 0;
+					data[type] = '';
 				}
 				//样品数
 				if (type == 'sampleQuantity') {
@@ -296,7 +301,7 @@
 								icon: false,
 								message: "损耗合格数与留样合格数之和不能大于样品合格数",
 							}, )
-							data[type] = 0
+							data[type] = ''
 						}
 
 					} else {
@@ -307,12 +312,13 @@
 								icon: false,
 								message: "损耗不合格数与留样不合格数之和不能大于样品不合格数",
 							}, )
-							data[type] = 0
+							data[type] = ''
 						}
 					}
 				}
-
-				this.$set(this, 'form', JSON.parse(JSON.stringify((data))))
+				this.$nextTick(() => {
+					this.$set(this, 'form', JSON.parse(JSON.stringify((data))))
+				})
 			}
 
 		}

+ 8 - 6
pages/tour_tally/check/components/CheckCard.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="kd-check-card">
 		<view class="title">
+			<checkbox :value="item.id" color="#fff" />
 			<text class="label">{{ index + 1 }}</text>
 			<text>{{ item.name }}</text>
 		</view>
@@ -35,7 +36,8 @@
 					<div v-else style="color: green">正常</div>
 				</view>
 				<view v-else>
-					<uni-data-picker @change="statusChange" style="width:100%" v-model="item.status" placeholder="请选择" :localdata="statusList" :clear-icon="false">
+					<uni-data-picker @change="statusChange" style="width:100%" v-model="item.status" placeholder="请选择"
+						:localdata="statusList" :clear-icon="false">
 					</uni-data-picker>
 				</view>
 			</text>
@@ -147,12 +149,12 @@
 				}
 			},
 			statusChange() {
-				if(this.item.status==1){
-					this.item.result='正常'
-				}else{
-					this.item.result='异常'
+				if (this.item.status == 1) {
+					this.item.result = '正常'
+				} else {
+					this.item.result = '异常'
 				}
-				
+
 			},
 
 			// *** 新增拍照功能

+ 1 - 1
pages/tour_tally/check/index.vue

@@ -23,7 +23,7 @@
 			<view class="check-list" ref="scrollContainer">
 
 				<view v-for="(item,index) in filterList">
-					<CheckCard :item="item" class="mb20" :index="index"></CheckCard>
+					<CheckCard :item="item" class="mb20" :index="index" ref="CheckCardRef"></CheckCard>
 				</view>
 			</view>
 			<view class="footer">

+ 30 - 18
pages/tour_tally/order/OrderTask.vue

@@ -16,7 +16,7 @@
 						<view class="item_box rx-bc">
 							<view class="item_one perce50 rx-sc">
 								<view class="lable">设备名称:</view>
-								<view>{{item.deviceName}}</view>
+								<view class="deviceName">{{item.deviceName}}</view>
 							</view>
 						</view>
 						<view class="item_box rx-bc">
@@ -39,7 +39,7 @@
 						</u-empty>
 					</view>
 				</u-list-item>
-	
+
 			</u-list>
 		</view>
 	</view>
@@ -102,7 +102,7 @@
 	.marginTop {
 		border-top: 20rpx solid $page-bg;
 	}
-	
+
 	// .content_box {
 	// 	height: 100vh;
 	// 	overflow: hidden;
@@ -110,29 +110,29 @@
 	// 	flex-direction: column;
 	// 	background-color: $page-bg;
 	// }
-	
+
 	.list_box {
 		flex: 1;
 		overflow: hidden;
 		padding: 16rpx 0;
-	
+
 		.u-list {
 			height: 100% !important;
 		}
 	}
-	
+
 	.card_box {
 		width: 750rpx;
 		padding: 16rpx 32rpx;
 		box-sizing: border-box;
 		border-bottom: 2rpx solid #E1E1E1;
-	
-	
+
+
 		.item_box {
 			margin-top: 10rpx;
-	
-	
-	
+
+
+
 			.round {
 				width: 40rpx;
 				height: 40rpx;
@@ -143,7 +143,7 @@
 				text-align: center;
 				font-size: 20rpx;
 			}
-	
+
 			.orderId {
 				color: #000;
 				font-family: PingFang HK;
@@ -152,7 +152,7 @@
 				font-weight: 600;
 				margin-left: 16rpx;
 			}
-	
+
 			.item_one {
 				width: 100%;
 				font-size: 26rpx;
@@ -160,23 +160,35 @@
 				font-weight: 400;
 				line-height: 38rpx;
 				word-wrap: break-word;
+
+				.lable {
+					width: 150rpx;
+				}
+
+				.deviceName {
+					width: calc(750rpx - 150rpx);
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 2;
+					overflow: hidden;
+				}
 			}
-	
+
 			.gylx {
 				color: $theme-color;
 			}
-	
+
 			.perce50 {
 				width: 100%;
 			}
 		}
-	
+
 		.flex_between {
 			display: flex;
 			justify-content: space-between;
 		}
 	}
-	
+
 	.state {
 		font-size: 28rpx;
 		color: #7f7f7f;
@@ -185,4 +197,4 @@
 		padding: 2px 5px;
 		border-radius: 10px;
 	}
-</style>
+</style>

+ 0 - 1
store/getters.js

@@ -9,7 +9,6 @@ const getters = {
     ) || {},
   // 根据字典enumName  和 dictCode 获取字典 值(名称
   getDictValue: state => (enumName, dictCode) => {
-	  console.log(state.dict,'state.dict')
     const obj = (state.dict[dictEnum[enumName]] || []).find(
       item => item.dictCode === dictCode
     )