From 20fa9f61227faa7514bf9305441535549b6af34a Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Sat, 21 May 2022 15:37:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E8=AE=B0=E5=BD=95=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=95=E7=94=A8=E8=A1=A8=E5=8D=95=EF=BC=8C?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=93=8D=E4=BD=9C=E8=AF=A6=E6=83=85=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hb_client/src/views/mtm/productList.vue  |  9 ++++-
 hb_client/src/views/mtm/step.vue         | 49 ++++++++++++++++--------
 hb_client/src/views/mtm/wproductList.vue |  9 ++++-
 hb_client/src/views/wpm/operationdo.vue  | 37 +++++++++++-------
 4 files changed, 73 insertions(+), 31 deletions(-)

diff --git a/hb_client/src/views/mtm/productList.vue b/hb_client/src/views/mtm/productList.vue
index 9b2e82b..f0dfaeb 100644
--- a/hb_client/src/views/mtm/productList.vue
+++ b/hb_client/src/views/mtm/productList.vue
@@ -268,7 +268,14 @@
       },
       //检查表
       handlebind(scope) {
-        this.$router.push({name: "MaterialDO", params: {id: scope.row.id},})
+        let materialItem = sessionStorage.getItem('materialItem');
+        if(materialItem){
+          sessionStorage.removeItem('materialItem');
+          sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
+        }else{
+          sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
+        }
+        this.$router.push({name: "MaterialDO", params: {id: scope.row.id}})
       },
       handleFilter() {
         this.listQuery.page = 1;
diff --git a/hb_client/src/views/mtm/step.vue b/hb_client/src/views/mtm/step.vue
index d2d90ca..1628577 100644
--- a/hb_client/src/views/mtm/step.vue
+++ b/hb_client/src/views/mtm/step.vue
@@ -157,19 +157,16 @@
               >
                 <template slot-scope="scope">
                   <el-link
-                    v-if="checkPermission(['material_update'])"
                     type="primary"
                     @click="handleLook(scope)"
                   >查看
                   </el-link>
                   <el-link
-                    v-if="checkPermission(['material_update'])"
                     type="primary"
                     @click="handleEdit(scope)"
                   >编辑
                   </el-link>
                   <el-link
-                    v-if="checkPermission(['material_delete'])"
                     type="danger"
                     @click="handleDelete(scope)"
                   >删除
@@ -208,6 +205,23 @@
                     </el-option>
                   </el-select>
                 </el-form-item>
+                <el-form-item label="引用表单" v-if="dialogType === 'new'">
+                  <el-select
+                    v-model="recordform.form"
+                    style="width: 100%"
+                    clearable
+                    filterable
+                    placeholder="请选择"
+                  >
+                    <el-option
+                      v-for="item in formList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id"
+                    >
+                    </el-option>
+                  </el-select>
+                </el-form-item>
                 <el-form-item label="关联产品">
                   <el-select style="width: 100%" v-model="recordform.material" placeholder="请选择">
                     <el-option
@@ -231,22 +245,21 @@
               :visible.sync="dialogVisibleForm"
               :title="tableForm.name">
               <el-form
-                label-width="80px"
+                label-width="180px"
                 label-position="right"
               >
                 <el-row v-for="(item,$index) in fieldList.results" :key="$index">
                   <el-form-item v-if="item.field_type==='string'" :label="item.field_name">
-                    <el-input placeholder="请输入" v-model="item.sort"/>
+                    <el-input placeholder="请输入"/>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='int'" :label="item.field_name">
-                    <el-input type="number" placeholder="请输入" v-model="item.sort"/>
+                    <el-input type="number" placeholder="请输入" />
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='float'" :label="item.field_name">
-                    <el-input type="number" placeholder="请输入" v-model="item.sort"/>
+                    <el-input type="number" placeholder="请输入"/>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='date'" :label="item.field_name">
                     <el-date-picker
-                      v-model="item.create_time"
                       type="date"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd"
@@ -256,7 +269,6 @@
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='datetime'" :label="item.field_name">
                     <el-date-picker
-                      v-model="item.create_time"
                       type="datetime"
                       placeholder="选择日期"
                       value-format="yyyy-MM-dd HH:mm:ss"
@@ -265,7 +277,7 @@
                     </el-date-picker>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='select'" :label="item.field_name">
-                    <el-select style="width: 100%" v-model="item.sort" placeholder="请选择">
+                    <el-select style="width: 100%" placeholder="请选择">
                       <el-option
                         v-for="item1 in item.field_choice"
                         :key="item1"
@@ -275,7 +287,7 @@
                     </el-select>
                   </el-form-item>
                   <el-form-item v-else-if="item.field_type==='selects'" :label="item.field_name">
-                    <el-select style="width: 100%" v-model="optio" multiple placeholder="请选择">
+                    <el-select style="width: 100%" multiple placeholder="请选择">
                       <el-option
                         v-for="item1 in item.field_choice"
                         :key="item1"
@@ -551,6 +563,7 @@
             label: '多选'
           }
         ],
+        formList:[],
         typeoptions: [{
           value: 10,
           label: '生产记录'
@@ -563,10 +576,11 @@
       this.step.process = this.$route.params.id;
       this.getList();
       this.getequipments()
-
     },
     mounted(){
+      this.step.process = this.$route.params.id;
       this.getProductList();
+      this.getFormList();
     },
     methods: {
       getProductList(){
@@ -585,8 +599,6 @@
         this.field_choice.splice(index, 1)
       },
       handleLook(scope) {
-        debugger;
-        console.log(scope);
         this.dialogVisibleForm = true;
         this.tableForm = Object.assign({}, scope.row); // copy obj
         this.formID = this.tableForm.id;
@@ -647,7 +659,6 @@
         });
       },
       rowClick(row) {
-
         this.stepid = row.id;
         this.recordformLists();
       },
@@ -720,6 +731,14 @@
 
         });
       },
+      getFormList(){
+        getrecordformList({page:0,type:10}).then((response) => {
+          if (response.data) {
+            this.formList = response.data;
+          }
+
+        });
+      },
       fieldLists() {
         this.listQueryfield.form = this.formID
         getrffieldList(this.listQueryfield).then((response) => {
diff --git a/hb_client/src/views/mtm/wproductList.vue b/hb_client/src/views/mtm/wproductList.vue
index 3f174e9..b81c9ab 100644
--- a/hb_client/src/views/mtm/wproductList.vue
+++ b/hb_client/src/views/mtm/wproductList.vue
@@ -241,7 +241,14 @@
         },
         //检查表
         handlebind(scope) {
-          this.$router.push({name: "MaterialDO", params: {id: scope.row.id},})
+          let materialItem = sessionStorage.getItem('materialItem');
+          if(materialItem){
+            sessionStorage.removeItem('materialItem');
+            sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
+          }else{
+            sessionStorage.setItem('materialItem',JSON.stringify(scope.row));
+          }
+          this.$router.push({name: "MaterialDO", params: {id: scope.row.id}})
         },
         handleFilter() {
           this.listQuery.page = 1;
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index 22df643..5873372 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -10,7 +10,23 @@
         >查看作业指导书
         </el-button>
       </div>
-      <el-form
+      <el-descriptions :column="3" border style="margin-bottom: 20px">
+        <el-descriptions-item label="任务编号" v-if="operationData.number">{{operationData.number}}</el-descriptions-item>
+        <el-descriptions-item label="产品名称" v-if="operationData.name">{{operationData.name}}</el-descriptions-item>
+        <el-descriptions-item label="规格型号" v-if="operationData.specification">{{operationData.specification}}</el-descriptions-item>
+        <el-descriptions-item label="子工序">{{operationData.step_.name}}</el-descriptions-item>
+        <el-descriptions-item label="创建时间">{{operationData.create_time}}</el-descriptions-item>
+        <el-descriptions-item label="操作人">{{operationData.user}}</el-descriptions-item>
+      </el-descriptions>
+      <el-button
+        v-if="operationData.is_submited == false"
+        type="primary"
+        style="float: right"
+        @click="handlesubmit()"
+      >
+        提交本次操作
+      </el-button>
+     <!-- <el-form
         ref="form"
         inline="true"
         :model="operationData"
@@ -53,16 +69,9 @@
           ></el-input>
         </el-form-item>
         <el-form-item>
-          <el-button
-            v-if="operationData.is_submited == false"
-            type="primary"
-            style="float: right"
-            @click="handlesubmit()"
-          >
-            提交本次操作
-          </el-button>
+
         </el-form-item>
-        <!--
+        &lt;!&ndash;
           <el-form-item label="边角料">
             <el-radio-group v-model="operationData.use_scrap">
               <el-radio border
@@ -76,7 +85,7 @@
           <el-form-item label="备注" v-if="operationData.use_scrap">
             <el-input type="textarea" v-model="operationData.remark"></el-input>
           </el-form-item>
-!-->
+!&ndash;&gt;
         <el-form-item v-if="operationData.use_scrap">
           <el-button
             type="primary"
@@ -86,7 +95,7 @@
           </el-button>
           <el-button>取消</el-button>
         </el-form-item>
-      </el-form>
+      </el-form>-->
       <el-drawer
         title="作业指导书查看!"
         :visible.sync="drawer"
@@ -918,8 +927,8 @@
               numbers +=item.plan.number;
               specification +=item.product.specification;
             });
-            this.operationData.number = names;
-            this.operationData.name = numbers;
+            this.operationData.number = numbers;
+            this.operationData.name =  names;
             this.operationData.specification = specification;
 
             if (response.data.is_submited) {