[fix] 修改问题

jzjx_project/controllers/inherit_production.py

@@ -116,7 +116,8 @@ class JzjxRokeRefixAutoWorkOrder(http.Controller):
                 v.generate_access_token()
                 v.generate_access_token()
             url = f"/web/image/{v.id}?access_token={v.access_token}&unique={str(fields.Datetime.now().timestamp())}"
             url = f"/web/image/{v.id}?access_token={v.access_token}&unique={str(fields.Datetime.now().timestamp())}"
             data_list.append(url)
             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='*')
     @http.route('/roke/mes/work_time/get', type='json', auth="user", csrf=False, cors='*')
     def get_work_time(self):
     def get_work_time(self):

jzjx_project/static/src/html/view/zdy_gdbg.html

@@ -334,6 +334,9 @@
                                            :value="items.id"></el-option>
                                            :value="items.id"></el-option>
                             </el-select>
                             </el-select>
                         </div>
                         </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 "
                         <div v-if="!allow" v-for="(item,index) in xdy_title "
                              style="display: flex;width:25%;justify-content: flex-start; align-items: center;">
                              style="display: flex;width:25%;justify-content: flex-start; align-items: center;">
@@ -1233,7 +1236,9 @@
                 gdId: null, // 当前工单id
                 gdId: null, // 当前工单id
                 work_center_show: false, // 判断工作中心是否必传标识
                 work_center_show: false, // 判断工作中心是否必传标识
                 document_list: [],
                 document_list: [],
-                default_process_id:null
+                default_process_id:null,
+                noteValue: '',
+                workType: ''
             }
             }
         },
         },
         created() {
         created() {
@@ -1937,7 +1942,23 @@ list[item.field_index] = that.default_process_id
 
 
             // 获取报工、查看弹窗数据
             // 获取报工、查看弹窗数据
             showData(val) {
             showData(val) {
+                console.log(val)
                 let that = this;
                 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) {
                 if (that.allow) {
                     // 可报工
                     // 可报工