From f7e6772d321dface47700d84264ea3e965b67f7c Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 2 Sep 2021 14:09:46 +0800
Subject: [PATCH 1/2] xiala

---
 hb_client/src/api/mtm.js                |  61 ++++-
 hb_client/src/views/equipment/index.vue |   5 +-
 hb_client/src/views/mtm/stepdo.vue      | 326 +++++++++++++++++++++++-
 3 files changed, 386 insertions(+), 6 deletions(-)

diff --git a/hb_client/src/api/mtm.js b/hb_client/src/api/mtm.js
index 92a05dc..d9b80c4 100644
--- a/hb_client/src/api/mtm.js
+++ b/hb_client/src/api/mtm.js
@@ -187,7 +187,6 @@ export function deleteOutputmaterial(id, data) {
   })
 }
 //子工序
-//输出物料
 
 export function getUsedstepList(query) {
   return request({
@@ -209,4 +208,64 @@ export function deleteUsedstep(id, data) {
     method: 'delete',
     data
   })
+}
+//记录表格
+
+export function getrecordformList(query) {
+  return request({
+    url: '/mtm/recordform/',
+    method: 'get',
+    params: query
+  })
+}
+export function createrecordform(data) {
+  return request({
+    url: '/mtm/recordform/',
+    method: 'post',
+    data
+  })
+}
+export function updaterecordform(id, data) {
+  return request({
+    url: `/mtm/recordform/${id}/`,
+    method: 'put',
+    data
+  })
+}
+export function deleterecordform(id, data) {
+  return request({
+    url: `/mtm/recordform/${id}/`,
+    method: 'delete',
+    data
+  })
+}
+//记录表格字段表 
+
+export function getrffieldList(query) {
+  return request({
+    url: '/mtm/recordform-field/',
+    method: 'get',
+    params: query
+  })
+}
+export function createrffield(data) {
+  return request({
+    url: '/mtm/recordform-field/',
+    method: 'post',
+    data
+  })
+}
+export function updaterffield(id, data) {
+  return request({
+    url: `/mtm/recordform-field/${id}/`,
+    method: 'put',
+    data
+  })
+}
+export function deleterffield(id, data) {
+  return request({
+    url: `/mtm/recordform-field/${id}/`,
+    method: 'delete',
+    data
+  })
 }
\ No newline at end of file
diff --git a/hb_client/src/views/equipment/index.vue b/hb_client/src/views/equipment/index.vue
index 01f2e74..0943614 100644
--- a/hb_client/src/views/equipment/index.vue
+++ b/hb_client/src/views/equipment/index.vue
@@ -45,7 +45,10 @@
           <template slot-scope="scope">{{ scope.row.name }}</template>
         </el-table-column>
        
-        <el-table-column label="设备型号">
+        <el-table-column label="设备编号">
+          <template slot-scope="scope">{{ scope.row.number }}</template>
+        </el-table-column>
+         <el-table-column label="型号规格">
           <template slot-scope="scope">{{ scope.row.model }}</template>
         </el-table-column>
         <el-table-column label="购置日期">
diff --git a/hb_client/src/views/mtm/stepdo.vue b/hb_client/src/views/mtm/stepdo.vue
index f3460c2..a140cbc 100644
--- a/hb_client/src/views/mtm/stepdo.vue
+++ b/hb_client/src/views/mtm/stepdo.vue
@@ -13,22 +13,191 @@
   </el-descriptions-item>
   <el-descriptions-item label="指导书内容" label-class-name="my-label" :contentStyle="{'text-align': 'left'}">{{step.instruction_content}}</el-descriptions-item>
 </el-descriptions>
+   </el-card>
+<el-card>
+        
+   <el-tabs type="border-card">
+  <el-tab-pane label="过程记录">
    
+        <el-row :gutter="24">
+  <el-col :span="6" >
+ <el-card style="margin-top: 10px">
+    <el-button type="primary" icon="el-icon-plus" @click="handleCreate"
+        >新增</el-button>
+      <el-table
+       
+        :data="recordformList.results"
+        border
+        fit
+        stripe
+        highlight-current-row
+        height="100"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
+         @current-change="handleCurrentChange"
+    >
+   
+        <el-table-column type="index" width="50" />
+         <el-table-column label="产品信息">
+          <template slot-scope="scope">{{ scope.row.name }}</template>
+       
+        
+        </el-table-column>
+           <el-table-column
+          align="center"
+          label="操作"
+          
+        >
+          <template slot-scope="scope">
+           
+            <el-link
+              v-if="checkPermission(['material_update'])"
+              @click="handleEdit(scope)"
+              >编辑</el-link
+            >
+            <el-link
+              v-if="checkPermission(['material_delete'])"
+              type="danger"
+              @click="handleDelete(scope)"
+              >删除</el-link
+            >
+          </template>
+        </el-table-column>
+     
+      </el-table>
+    
+    </el-card>
+
+  </el-col>
+  <el-col :span="18" >
+ <el-card class="box-card">
+    <el-button type="primary" icon="el-icon-plus" @click="handlefieldCreate"
+        >新增</el-button>
+      <el-table
+       
+        :data="fieldList.results"
+        border
+        fit
+        stripe
+        highlight-current-row
+        height="100"
+        v-el-height-adaptive-table="{bottomOffset: 50}"
+        
+    >
+   
+        <el-table-column type="index" width="50" />
+        
+      
+           <el-table-column
+          align="center"
+          label="操作"
+          
+        >
+          <template slot-scope="scope">
+           
+            <el-link
+              v-if="checkPermission(['material_update'])"
+              @click="handlefieldEdit(scope)"
+              >编辑</el-link
+            >
+            <el-link
+              v-if="checkPermission(['material_delete'])"
+              type="danger"
+              @click="handlefieldDelete(scope)"
+              >删除</el-link
+            >
+          </template>
+        </el-table-column>
+     
+      </el-table>
+    </el-card>
+
+  </el-col>
+  </el-row>
+ <el-dialog
+      :visible.sync="dialogVisible1"
+      :title="dialogType1 === 'edit' ? '编辑表格字段' : '新增表格字段'"
+    >
+      <el-form
+        ref="Form"
+        :model="field"
+        label-width="80px"
+        label-position="right"
+      >
+       
+         <el-form-item label="字段类型" prop="field_type">
+          <el-input v-model="field.field_type" placeholder="字段类型" />
+        </el-form-item>
+         <el-form-item label="字段标识" prop="field_key">
+          <el-input v-model="field.field_key" placeholder="字段标识" />
+        </el-form-item>
+         <el-form-item label="字段名称" prop="field_name">
+          <el-input v-model="field.field_name" placeholder="字段名称" />
+        </el-form-item>
+         <el-form-item label="显示名" prop="boolean_field_display">
+          <el-input v-model="field.boolean_field_display" placeholder="显示名" />
+        </el-form-item>
+       <el-form-item label="选项" prop="field_choice">
+          <el-input v-model="field.field_choice" placeholder="选项" />
+        </el-form-item>
+         <el-form-item label="排序" prop="sort">
+          <el-input v-model="field.sort" placeholder="排序" />
+        </el-form-item>
+      
+         
+        
+      </el-form>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogVisible1 = false">取消</el-button>
+        <el-button type="primary" @click="fieldconfirm('Form')">确认</el-button>
+      </div>
+    </el-dialog>
+  </el-tab-pane>
+</el-tabs>
       
     </el-card>
    
   </div>
 </template>
 <script>
-import { getStep} from "@/api/mtm";
+import { getStep,getrecordformList,createrecordform,updaterecordform,deleterecordform,getrffieldList,createrffield,updaterffield,
+deleterffield} from "@/api/mtm";
 import checkPermission from "@/utils/permission";
-
-
+const defaultrecordform = {
+ 
+};
+const defaultfield = {
+ 
+};
 export default {
   components: {  },
   data() {
     return {
     step:"",
+      recordform: defaultrecordform,
+        field: defaultfield,
+       dialogType: "new",
+      dialogVisible:false,
+       dialogType1: "new",
+      dialogVisible1:false,
+       listQueryrecordform: {
+        page: 1,
+        page_size: 20,
+      },
+       recordformList: {
+        count: 0,
+      },
+        fieldList: {
+        count: 0,
+      },
+       listQueryfield: {
+        page: 1,
+        page_size: 20,
+      },
+      
+       typeoptions: [{
+          value: 1,
+          label: '生产记录'
+        }],
     };
   },
   computed: {},
@@ -36,6 +205,8 @@ export default {
   created() {
     
    this.getStepD();
+   this.recordformLists();
+    this.fieldLists();
   },
   methods: {
     checkPermission,
@@ -47,7 +218,154 @@ export default {
         }
        
       });
-     }
+     },
+      
+    handleCurrentChange(row){
+     this.formID=row.id;
+     alert(this.form)
+    },
+     recordformLists()
+     {
+       this.listQueryrecordform.step=this.$route.params.id;
+      getrecordformList(this.listQueryrecordform).then((response) => {
+        if (response.data) {
+          this.recordformList = response.data;
+        }
+       
+      });
+     },
+      fieldLists()
+     {
+       this.listQueryfield.step=this.$route.params.id;
+      getrffieldList(this.listQueryfield).then((response) => {
+        if (response.data) {
+          this.fieldList = response.data;
+        }
+       
+      });
+     },
+      handleCreate() {
+      this.recordform = Object.assign({}, defaultrecordform);
+      this.dialogType = "new";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Forms"].clearValidate();
+      });
+    },
+      handlefieldCreate() {
+      this.field = Object.assign({}, defaultfield);
+      this.dialogType1 = "new";
+      this.dialogVisible1 = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+      handleEdit(scope) {
+      this.recordform = Object.assign({}, scope.row); // copy obj
+      this.dialogType = "edit";
+      this.dialogVisible = true;
+      this.$nextTick(() => {
+        this.$refs["Forms"].clearValidate();
+      });
+    },
+     handlefieldEdit(scope) {
+      this.field = Object.assign({}, scope.row); // copy obj
+      this.dialogType1 = "edit";
+      this.dialogVisible1 = true;
+      this.$nextTick(() => {
+        this.$refs["Form"].clearValidate();
+      });
+    },
+    handleDelete(scope) {
+      this.$confirm("确认删除?", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "error",
+      })
+        .then(async () => {
+          await deleterecordform(scope.row.id);
+          this.recordformLists()
+          this.$message.success("成功");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+     handlefieldDelete(scope) {
+      this.$confirm("确认删除?", "警告", {
+        confirmButtonText: "确认",
+        cancelButtonText: "取消",
+        type: "error",
+      })
+        .then(async () => {
+          await deleterffield(scope.row.id);
+          this.fieldLists()
+          this.$message.success("成功");
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
+     async recordformconfirm(form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          const isEdit = this.dialogType === "edit";
+          if (isEdit) {
+            this.recordform.step=this.$route.params.id
+            
+            updaterecordform(this.recordform.id, this.recordform).then((res) => {
+              if (res.code >= 200) {
+                this.recordformLists()
+                this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          } else {
+            this.recordform.step=this.$route.params.id
+            
+            createrecordform(this.recordform).then((res) => {
+              if (res.code >= 200) {
+               this.recordformLists()
+                 this.dialogVisible = false;
+                this.$message.success("成功");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+  async fieldconfirm(form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          const isEdit = this.dialogType1 === "edit";
+          if (isEdit) {
+            this.field.form=this.formID
+            
+            updaterffield(this.field.id, this.field).then((res) => {
+              if (res.code >= 200) {
+                this.fieldLists()
+                this.dialogVisible1 = false;
+                this.$message.success("成功");
+              }
+            });
+          } else {
+            this.field.form=this.formID
+            
+            createrffield(this.field).then((res) => {
+              if (res.code >= 200) {
+               this.fieldLists()
+                 this.dialogVisible1 = false;
+                this.$message.success("成功");
+              }
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
   },
 };
 </script>

From b2d1383d85e7964f5d4c47d25c58fd78a6bee59c Mon Sep 17 00:00:00 2001
From: shilixia <2309368887@qq.com>
Date: Thu, 2 Sep 2021 15:12:47 +0800
Subject: [PATCH 2/2] biaoge

---
 hb_client/src/views/mtm/stepdo.vue | 152 ++++++++++++++++++++++++++---
 1 file changed, 140 insertions(+), 12 deletions(-)

diff --git a/hb_client/src/views/mtm/stepdo.vue b/hb_client/src/views/mtm/stepdo.vue
index a140cbc..e613d63 100644
--- a/hb_client/src/views/mtm/stepdo.vue
+++ b/hb_client/src/views/mtm/stepdo.vue
@@ -64,7 +64,39 @@
         </el-table-column>
      
       </el-table>
-    
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :title="dialogType === 'edit' ? '编辑记录表格' : '新增记录表格'"
+    >
+      <el-form
+        ref="Forms"
+        :model="recordform"
+        label-width="80px"
+        label-position="right"
+      >
+       
+         <el-form-item label="表格名称" prop="name">
+          <el-input v-model="recordform.name" placeholder="表格名称" />
+        </el-form-item>
+        <el-form-item label="表格类型" prop="type">
+        <el-select  style="width: 100%" v-model="recordform.type" placeholder="请选择">
+             <el-option
+                v-for="item in typeoptions"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
+        </el-form-item>
+      
+         
+        
+      </el-form>
+      <div style="text-align: right">
+        <el-button type="danger" @click="dialogVisible = false">取消</el-button>
+        <el-button type="primary" @click="recordformconfirm('Forms')">确认</el-button>
+      </div>
+    </el-dialog>
     </el-card>
 
   </el-col>
@@ -84,8 +116,25 @@
         
     >
    
-        <el-table-column type="index" width="50" />
-        
+       <el-table-column type="index" width="50" />
+         <el-table-column label="字段类型">
+          <template slot-scope="scope">{{ options_[scope.row.field_type] }}</template>
+        </el-table-column>
+
+        <el-table-column label="字段名称">
+          <template slot-scope="scope">{{ scope.row.field_name }}</template>
+        </el-table-column>
+       
+        <el-table-column label="字段标识">
+          <template slot-scope="scope">{{ scope.row.field_key }}</template>
+        </el-table-column>
+        <el-table-column label="布尔类型显示名">
+          <template slot-scope="scope">{{ scope.row.boolean_field_display }}</template>
+        </el-table-column>
+          <el-table-column label="选项显示名">
+          <template slot-scope="scope">{{ scope.row.field_choice }}</template>
+        </el-table-column>
+       
       
            <el-table-column
           align="center"
@@ -125,7 +174,14 @@
       >
        
          <el-form-item label="字段类型" prop="field_type">
-          <el-input v-model="field.field_type" placeholder="字段类型" />
+            <el-select  style="width: 100%"  v-model="field.field_type" placeholder="请选择">
+             <el-option
+                v-for="item in fieldtypeoptions"
+                :key="item.value"
+                :label="item.label"
+               :value="item.value">
+              </el-option>
+          </el-select>
         </el-form-item>
          <el-form-item label="字段标识" prop="field_key">
           <el-input v-model="field.field_key" placeholder="字段标识" />
@@ -133,11 +189,24 @@
          <el-form-item label="字段名称" prop="field_name">
           <el-input v-model="field.field_name" placeholder="字段名称" />
         </el-form-item>
-         <el-form-item label="显示名" prop="boolean_field_display">
-          <el-input v-model="field.boolean_field_display" placeholder="显示名" />
+         <el-form-item label="布尔类型显示名" prop="boolean_field_display">
+              <vue-json-editor
+      v-model="field.boolean_field_display"
+      :showBtns="false"
+      :mode="'code'"
+      lang="zh"
+     
+    />
         </el-form-item>
        <el-form-item label="选项" prop="field_choice">
-          <el-input v-model="field.field_choice" placeholder="选项" />
+       
+           <vue-json-editor
+      v-model="field.field_choice"
+      :showBtns="false"
+      :mode="'code'"
+      lang="zh"
+     
+    />
         </el-form-item>
          <el-form-item label="排序" prop="sort">
           <el-input v-model="field.sort" placeholder="排序" />
@@ -161,6 +230,8 @@
 <script>
 import { getStep,getrecordformList,createrecordform,updaterecordform,deleterecordform,getrffieldList,createrffield,updaterffield,
 deleterffield} from "@/api/mtm";
+
+ import vueJsonEditor from 'vue-json-editor'
 import checkPermission from "@/utils/permission";
 const defaultrecordform = {
  
@@ -169,7 +240,7 @@ const defaultfield = {
  
 };
 export default {
-  components: {  },
+  components: { vueJsonEditor },
   data() {
     return {
     step:"",
@@ -193,7 +264,63 @@ export default {
         page: 1,
         page_size: 20,
       },
-      
+      options_: {
+           'string':'字符串',
+           'int':'整型',
+         'float': '浮点',
+          'boolean':'布尔',
+         'date': '日期',
+          'datetime': '日期时间',
+           'radio': '单选',
+            'checkbox': '多选',
+             'select': '单选下拉',
+             'selects': '多选下拉',
+              'textarea': '文本域'
+        },
+        fieldtypeoptions: [{
+          value: 'string',
+          label: '字符串'
+        },
+        {
+          value: 'int',
+          label: '整型'
+        },
+        {
+          value: 'float',
+          label: '浮点'
+        },
+        {
+          value: 'boolean',
+          label: '布尔'
+        },
+        {
+          value: 'date',
+          label: '日期'
+        },
+        {
+          value: 'datetime',
+          label: '日期时间'
+        },
+        {
+          value: 'radio',
+          label: '单选'
+        },
+        {
+          value: 'checkbox',
+          label: '多选'
+        },
+        {
+          value: 'select',
+          label: '单选下拉'
+        },
+        {
+          value: 'selects',
+          label: '多选下拉'
+        },
+        {
+          value: 'textarea',
+          label: '文本域'
+        }],
        typeoptions: [{
           value: 1,
           label: '生产记录'
@@ -206,7 +333,7 @@ export default {
     
    this.getStepD();
    this.recordformLists();
-    this.fieldLists();
+    
   },
   methods: {
     checkPermission,
@@ -222,7 +349,8 @@ export default {
       
     handleCurrentChange(row){
      this.formID=row.id;
-     alert(this.form)
+     this.fieldLists();
+     
     },
      recordformLists()
      {
@@ -236,7 +364,7 @@ export default {
      },
       fieldLists()
      {
-       this.listQueryfield.step=this.$route.params.id;
+       this.listQueryfield.form=this.formID
       getrffieldList(this.listQueryfield).then((response) => {
         if (response.data) {
           this.fieldList = response.data;