diff --git a/src/App.vue b/src/App.vue
index dd2bb78..635a3b1 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,116 +1,113 @@
\ No newline at end of file
+@import 'vk-uview-ui/index.scss';
+
diff --git a/src/api/spotCheckOrder.ts b/src/api/spotCheckOrder.ts
index 6241be0..1f0c8ab 100644
--- a/src/api/spotCheckOrder.ts
+++ b/src/api/spotCheckOrder.ts
@@ -31,6 +31,12 @@ export function spotCheckOrderPage(params,type) {
}
}
+
+// 待接单编辑
+export function orderEditClick(params) {
+ return http.post('/eam/device-spot-inspection-record-main/complete',params)
+}
+
// 操作工单
export function orderClick(params,type) {
if (type == 'DEVICE') {
diff --git a/src/pages.json b/src/pages.json
index 3d4d2e9..85af30a 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -149,6 +149,14 @@
"navigationBarTextStyle": "white"
}
}
+ ,{
+ "path": "pages/spotCheckOrder/detailAndEdit",
+ "style": {
+ "navigationBarTitleText": "点检工单详情",
+ "navigationBarBackgroundColor": "#409eff",
+ "navigationBarTextStyle": "white"
+ }
+ }
,{
"path": "pages/spotCheckOrder/addForm",
"style": {
diff --git a/src/pages/spotCheckOrder/detailAndEdit.vue b/src/pages/spotCheckOrder/detailAndEdit.vue
new file mode 100644
index 0000000..189d07c
--- /dev/null
+++ b/src/pages/spotCheckOrder/detailAndEdit.vue
@@ -0,0 +1,779 @@
+
+
+
+
+
+ 点检工单
+
+
+
+ 工单单号：
+ {{ data.number }}
+
+
+ *
+ 点检描述：
+
+
+
+
+
+ *
+ 班次：
+
+
+
+ {{ data.classesName }}
+
+
+ {{ `请选择班次` }}
+
+
+
+
+
+ 点检人：
+ {{ store.name }}
+
+
+ 点检时间：
+ {{ $time.formatDate(data.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ changeItem.name }}
+
+
+
+ 编号：
+ {{ data.deviceNumber }}
+
+
+ 名称：
+ {{ data.name }}
+
+
+ 所属厂区：
+ {{ data.factoryAreaName }}
+
+
+ 类型：
+ {{ data.type == 'DEVICE' ? '设备' : data.type == 'TECH' ? '工艺' : '模具' }}
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+ 设备部位名称: {{ item.equipmentPosition }}
+
+
+ 是否符合:
+
+
+
+
+ 符合
+
+
+ 不符合
+
+
+
+
+
+
+
+
+ 巡检点检记录:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/pages/spotCheckOrder/index.vue b/src/pages/spotCheckOrder/index.vue
index 14dff80..dc6d9dc 100644
--- a/src/pages/spotCheckOrder/index.vue
+++ b/src/pages/spotCheckOrder/index.vue
@@ -1,240 +1,232 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.describes}}
-
-
-
-
-
-
-
-
-
-
-
- 工单单号:{{item.number}}
-
-
- 类型:{{item.type=='DEVICE'?'设备':item.type=='TECH'?'工艺':'模具'}}
-
-
- {{`${params.type=='DEVICE'?'设备' : '模具'}`}}编号:{{item.deviceNumber}}
-
-
- {{`${params.type=='DEVICE'?'设备' : '模具'}`}}名称:{{item.name}}
-
-
- 所属厂区:{{item.factoryAreaName}}
-
-
- 班次:{{item.classesName}}
-
-
- 点检人:{{item.maintenanceName}}
-
-
-
-
- {{`${$time.formatDate(item.createTime)}`}}
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.describes }}
+
+
+
+
+
+
+
+
+
+
+
+ 工单单号:{{ item.number }}
+
+
+ 类型:{{ item.type == 'DEVICE' ? '设备' : item.type == 'TECH' ? '工艺' : '模具' }}
+
+
+ {{ `${params.type == 'DEVICE' ? '设备' : '模具'}` }}编号:{{ item.deviceNumber }}
+
+
+ {{ `${params.type == 'DEVICE' ? '设备' : '模具'}` }}名称:{{ item.name }}
+
+
+ 所属厂区:{{ item.factoryAreaName }}
+
+
+ 班次:{{ item.classesName }}
+
+
+ 点检人:{{ item.maintenanceName }}
+
+
+
+
+ {{ `${$time.formatDate(item.createTime)}` }}
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+.container {
+ background: #f5f5f5;
+ min-height: 100vh;
+}
+.list {
+ background: #f5f5f5;
+ margin-top: 20rpx;
+
+ .item {
+ padding: 30rpx 30rpx 0px 30rpx;
+ margin-top: 20rpx;
+ background: white;
+
+ .title {
+ display: flex;
+ align-items: center;
+ padding-bottom: 20rpx;
+
+ .title-txt {
+ color: #409eff;
+ font-weight: bold;
+ font-size: 36rpx;
+ width: 0px;
+ flex: 1;
+ word-wrap: break-word;
+ }
+
+ .time {
+ color: #919191;
+ }
+ }
+
+ .dec {
+ padding-bottom: 20rpx;
+
+ span {
+ color: #999999;
+ }
+ }
+
+ .last {
+ padding-bottom: 30rpx;
+ }
+
+ .bottom {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border-top: 1px solid #e4e4e4;
+ padding: 20rpx 0px;
+ }
+ }
+}
+
+.list {
+ background: #f5f5f5;
+ margin-top: 20rpx;
+
+ .item {
+ padding: 30rpx 30rpx 0px 30rpx;
+ margin-top: 20rpx;
+ background: white;
+
+ .title {
+ display: flex;
+ align-items: center;
+ padding-bottom: 20rpx;
+
+ .title-txt {
+ color: #409eff;
+ font-weight: bold;
+ font-size: 36rpx;
+ width: 0px;
+ flex: 1;
+ }
+
+ .time {
+ color: #919191;
+ }
+ }
+
+ .dec {
+ padding-bottom: 20rpx;
+
+ span {
+ color: #999999;
+ }
+ }
+
+ .last {
+ padding-bottom: 30rpx;
+ }
+
+ .bottom {
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ border-top: 1px solid #e4e4e4;
+ padding: 20rpx 0px;
+ position: relative;
+
+ .button {
+ position: absolute;
+ right: 0rpx;
+ }
+ }
+ }
+}
+