Merge branch 'v2' of https://e.coding.net/ctcdevteam/ehs/ehs_web into v2

src/api/model/pm.js

@@ -44,6 +44,14 @@ export default {
 					data);
 			}
 		},
+		addInfo: {
+			name: "添加信息",
+			req: async function(id, data){
+				return await http.post(
+					`${config.API_URL}/pm/mtask/${id}/add_info/`,
+					data);
+			}
+		},
         delete: {
 			name: "删除",
 			req: async function(id){

src/views/wpm/mlog_dept10.vue

@@ -56,11 +56,15 @@
                 </el-aside>
                 <el-main class="nopadding">
                     <el-container>
-                        <el-header style="height: 30%; padding: 0">
+                        <el-header style="height: 30%; padding: 0;">
-                            <el-card style="width: 100%; height: 100%">
+                            <el-card style="width: 100%; height: 100%; overflow-y: auto;">
                                 <template #header>
                                     <div class="card-header">
                                         <span>任务信息</span>
+                                        <span>
+                                            <el-button type="primary" link @click="addMtaskInfo"
+                                        v-if="currentMtask && (currentMtask.state == 20||currentMtask.state==10)">编辑</el-button>
+                                        </span>
                                     </div>
                                 </template>
                                 <el-descriptions>
@@ -76,7 +80,10 @@
                                     }}</el-descriptions-item>
                                     <el-descriptions-item label="不合格数">{{ currentMtask.count_notok
                                     }}</el-descriptions-item>
+                                    <el-descriptions-item label="配粉料数">{{ currentMtask.peifen_kg
+                                    }}</el-descriptions-item>
                                 </el-descriptions>
+                                
                             </el-card>
                         </el-header>
                         <el-main class="nopadding">
@@ -252,6 +259,28 @@
         :mlogId="mlogId"
         @closed="visibleDrawer = false">
         </showDrawer>
+        <el-dialog title="编辑任务" v-model="addMtaskInfoVisible">
+            <el-form :model="addMtaskInfoForm">
+                <el-form-item label="配分料数(kg)" width="100">
+            <el-input-number
+              v-model="addMtaskInfoForm.peifen_kg"
+              controls-position="right"
+              :min="0"
+              :step="1"
+              :step-strictly="true"
+              style="width: 100%"
+              placeholder="请输入"
+            >
+            </el-input-number>
+          </el-form-item>
+            </el-form>
+            <el-footer>
+      <el-button type="primary" @click="updateMtaskSubmit"
+        >确定</el-button
+      >
+      <el-button @click="addMtaskInfoVisible = false">取消</el-button>
+    </el-footer>
+        </el-dialog>
     </el-container>
 </template>
 <script>
@@ -263,6 +292,8 @@ export default {
     },
     data() {
         return {
+            addMtaskInfoForm: {},
+            addMtaskInfoVisible: false,
             activeName:'10车间',
             mlogs:[],
             currentDept: {},
@@ -294,6 +325,17 @@ export default {
         this.initDept()
     },
     methods: {
+        addMtaskInfo() {
+            this.addMtaskInfoForm.peifen_kg = this.currentMtask.peifen_kg
+            this.addMtaskInfoVisible = true
+        },
+        updateMtaskSubmit() {
+            this.$API.pm.mtask.addInfo.req(this.currentMtask.id, this.addMtaskInfoForm).then(res=>{
+                this.currentMtask.peifen_kg = this.addMtaskInfoForm.peifen_kg
+                this.addMtaskInfoVisible = false
+                this.$message.success('操作成功')
+            })
+        },
         tomio() {
             this.$router.push({ name: "mainso_mio" });
         },