Commit 3fad1394 by 夏超

[fix] 修改问题

parent ca1ee715
......@@ -116,7 +116,8 @@ class JzjxRokeRefixAutoWorkOrder(http.Controller):
v.generate_access_token()
url = f"/web/image/{v.id}?access_token={v.access_token}&unique={str(fields.Datetime.now().timestamp())}"
data_list.append(url)
return {"code": 0, "message": "获取成功!", "data": data_list, "note": record_id.note or ""}
return {"code": 0, "message": "获取成功!", "type": work_order.type, "data": data_list,
"note": record_id.note or ""}
@http.route('/roke/mes/work_time/get', type='json', auth="user", csrf=False, cors='*')
def get_work_time(self):
......
......@@ -334,6 +334,9 @@
:value="items.id"></el-option>
</el-select>
</div>
<p style="font-weight: bold;" v-if="workType == '补件' || workType == '返修'">{{ workType }}备注:</p>
<!-- 文本 -->
<span style="line-height:50px;color: #009688;">{{ noteValue }}</span>
<!-- 仅查看 -->
<div v-if="!allow" v-for="(item,index) in xdy_title "
style="display: flex;width:25%;justify-content: flex-start; align-items: center;">
......@@ -1233,7 +1236,9 @@
gdId: null, // 当前工单id
work_center_show: false, // 判断工作中心是否必传标识
document_list: [],
default_process_id:null
default_process_id:null,
noteValue: '',
workType: ''
}
},
created() {
......@@ -1937,7 +1942,23 @@ list[item.field_index] = that.default_process_id
// 获取报工、查看弹窗数据
showData(val) {
console.log(val)
let that = this;
axios.request({
url: "/roke/work_record/get_image_data",
method: "post",
headers: {
'Content-Type': 'application/json'
},
data: {
"work_order_id": val.id
}
}).then((res) => {
if (res.data.result.code === 0) {
this.noteValue = res.data.result.note;
this.workType = res.data.result.type;
}
});
// 判断是否可以报工
if (that.allow) {
// 可报工
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment