取消
@@ -211,7 +245,8 @@ export default {
page_size: 20,
},
- progressList:[],
+ xhwl:[],
+ ccwl:[],
listLoading: true,
dialogVisible: false,
dialogVisibles: false,
@@ -262,9 +297,24 @@ export default {
handleselectclick(scope)
{
this.dialogVisibles = true;
+ this.xhwl=[];
+
+ this.ccwl=[];
getProgress(scope.row.id).then((res) => {
if (res.code >= 200) {
- this.progressList = res.data;
+
+ res.data.forEach((item) => {
+
+ if(item.type==1)
+ {
+ this.xhwl.push(item);
+ }
+ else{
+ this.ccwl.push(item);
+ }
+
+ });
+
}
});
},
diff --git a/hb_client/src/views/qm/processtest.vue b/hb_client/src/views/qm/processtest.vue
index e309602..7caa670 100644
--- a/hb_client/src/views/qm/processtest.vue
+++ b/hb_client/src/views/qm/processtest.vue
@@ -316,12 +316,8 @@ export default {
//不合格玻璃审理单查看
handledetailbhg(scope)
{
- this.limitedRetrial=true;
- ticketread(scope.row.ticket).then((response) => {
- if (response.data) {
- this.customfieldList = response.data;
- }
- });
+
+ this.$router.push({name:"ticketDetail",params:{ticketId:scope.row.ticket}})
}
},
diff --git a/hb_client/src/views/qm/producttest.vue b/hb_client/src/views/qm/producttest.vue
index 8377d41..6ad92aa 100644
--- a/hb_client/src/views/qm/producttest.vue
+++ b/hb_client/src/views/qm/producttest.vue
@@ -1,12 +1,7 @@
-
-
-
-
-
-
+
-
-
- {{ scope.row.material_.name }}
-
-
-
+
+
{{ scope.row.number }}
-
-
- {{ actstate_[scope.row.act_state] }}
-
-
-
- {{ scope.row.step_.name }}
+
+ {{ scope.row.subproduction_plan_.number }}
+
+ {{ scope.row.material_.name }}
+
+
+ {{ scope.row.material_.specification }}
+
+
+
+
+ 未军检
+ 已军检
+
+
+
+
+
+ 不合格
+ 合格
+
+
+ {{ scope.row.warehouse_.name }}
+
+
+ {{ scope.row.number }}
+
+
+ {{ actstate_[scope.row.act_state]}}
+
+
检验
+ v-if="checkPermission(['warehouse_update'])&&scope.row.act_state==30&&scope.row.is_mtested==false"
+ @click="handleMtest(scope)"
+ >军检
检验记录
@@ -56,15 +71,77 @@
:limit.sync="listQuery.page_size"
@pagination="getList"
/>
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ scope.row.form_.name }}
+
+
+ {{ checkTypes[scope.row.type] }}
+
+
+
+ 已提交
+ 未提交
+
+
+
+
+
+ 查看
+
+
+
+
+
+
+
+
+
+
@@ -75,13 +152,15 @@
diff --git a/hb_client/src/views/qm/taskdetails.vue b/hb_client/src/views/qm/taskdetails.vue
index c48289b..61ea1d3 100644
--- a/hb_client/src/views/qm/taskdetails.vue
+++ b/hb_client/src/views/qm/taskdetails.vue
@@ -73,10 +73,12 @@
:data="wproduct"
border
fit
+ row-key="id"
stripe
style="width: 100%"
height="500"
- >
+ :load="load"
+ :tree-props="{children: 'children'}">
@@ -89,12 +91,18 @@
{{
scope.row.step_.name
}}
+
+
+ {{
+ scope.row.material_.name
+ }}
- {{
+ {{
actstate_[scope.row.act_state]
}}
+
-
+
{{ scope.row.name }}
-
+
{{ scope.row.number }}
-
+
{{ scope.row.amount }}
-
+
{{ scope.row.invoice }}
{{ scope.row.customer_.name }}
-
+
{{ scope.row.sign_date }}
@@ -71,6 +71,7 @@
align="center"
label="操作"
width="220px"
+ fixed="right"
>
@@ -112,7 +113,7 @@
@@ -122,10 +123,10 @@
-
+
-
+
diff --git a/hb_client/src/views/sam/contractdetail.vue b/hb_client/src/views/sam/contractdetail.vue
index 8dcbd7b..59e557a 100644
--- a/hb_client/src/views/sam/contractdetail.vue
+++ b/hb_client/src/views/sam/contractdetail.vue
@@ -2,10 +2,10 @@
-
- {{contractdetail.name}}
+
+ {{contractdetail.name}}
{{contractdetail.number}}
- {{contractdetail.amount}}
+ {{contractdetail.amount}}
{{contractdetail.customer_.name}}
@@ -20,6 +20,7 @@
fit
stripe
highlight-current-row
+ height="510px"
>
diff --git a/hb_client/src/views/sam/order.vue b/hb_client/src/views/sam/order.vue
index 4a4da9f..f64155d 100644
--- a/hb_client/src/views/sam/order.vue
+++ b/hb_client/src/views/sam/order.vue
@@ -121,7 +121,7 @@
>
-
+
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index 2a498fd..bfb4ae5 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -19,10 +19,17 @@
{{ scope.row.number }}
+
+ {{ scope.row.material_.specification }}
+
+
{{ actstate_[scope.row.act_state] }}
+
+
+ {{ scope.row.subproduction_plan_.number }}
{{ scope.row.step_.name }}
@@ -99,11 +106,17 @@
{{ scope.row.number }}
+
+
+ {{ scope.row.material_.specification }}
{{ actstate_[scope.row.act_state] }}
+
+
+ {{ scope.row.subproduction_plan_.number }}
{{ scope.row.step_.name }}
@@ -159,13 +172,18 @@
{{ scope.row.number }}
+
+
+ {{ scope.row.material_.specification }}
{{ actstate_[scope.row.act_state] }}
-
+
+ {{ scope.row.subproduction_plan_.number }}
+
{{ scope.row.step_.name }}
@@ -217,6 +235,9 @@
{{ actstate_[scope.row.act_state] }}
+
+
+ {{ scope.row.material_.specification }}
{{ scope.row.step_.name }}
@@ -225,6 +246,9 @@
{{ ng_sign_[scope.row.ng_sign] }}
+
+
+ {{ scope.row.subproduction_plan_.number }}
@@ -266,19 +290,26 @@
max-height="600"
>
+
+
{{ scope.row.material_.name }}
{{ scope.row.number }}
+
+
+ {{ scope.row.material_.specification }}
{{ actstate_[scope.row.act_state] }}
-
+
+ {{ scope.row.subproduction_plan_.number }}
+
{{ scope.row.step_.name }}
diff --git a/hb_client/src/views/wpm/operation.vue b/hb_client/src/views/wpm/operation.vue
index 926aaf5..cc8d5f8 100644
--- a/hb_client/src/views/wpm/operation.vue
+++ b/hb_client/src/views/wpm/operation.vue
@@ -36,12 +36,7 @@
scope.row.create_by_.username
}}
-
-
- 是
- 否
-
+
@@ -141,7 +136,7 @@ export default {
handleoperation(scope)
{
- this.$router.push({name: "operationdo", params: { id: scope.row.id,is_submited:scope.row.is_submited }, })
+ this.$router.push({name: "operationdo", params: { id: scope.row.id,submited:scope.row.is_submited }, })
},
//大工序工序渲染
getProcessList() {
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index a698c7d..bbf317f 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -3,6 +3,7 @@
基本信息
+
查看作业指导书
-
+
+ 提交本次操作
+
+
创建
取消
@@ -322,6 +328,16 @@
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+