xial

hb_client/src/router/index.js

@@ -97,7 +97,7 @@ export const asyncRoutes = [
         path: 'index',
         name: 'index',
         component: () => import('@/views/equipment/index'),
-        meta: { title: '设备台账', icon: 'example', perms: ['index_manage'] }
+        meta: { title: '运维记录', icon: 'example', perms: ['index_manage'] }
       }
     ]
   },

hb_client/src/views/equipment/index.vue

@@ -50,6 +50,9 @@
         </el-table-column>
          <el-table-column label="型号规格">
           <template slot-scope="scope">{{ scope.row.model }}</template>
+        </el-table-column>
+          <el-table-column label="类型">
+          <template slot-scope="scope">{{ type_[scope.row.type] }}</template>
         </el-table-column>
         <el-table-column label="购置日期">
           <template slot-scope="scope">{{ scope.row.buy_date }}</template>
@@ -66,6 +69,9 @@
         <el-table-column label="任务备注">
           <template slot-scope="scope">{{ scope.row.description }}</template>
         </el-table-column>
+          <el-table-column label="创建时间">
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        </el-table-column>
 
         <el-table-column
           align="center"
@@ -115,6 +121,17 @@
         </el-form-item>
          <el-form-item label="规格型号" prop="model">
           <el-input v-model="equipment.model" placeholder="规格型号" />
+        </el-form-item>
+          <el-form-item label="类型" prop="type">
+         
+           <el-select  style="width: 100%" v-model="equipment.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-item label="设备状态" prop="state">
          
@@ -127,6 +144,8 @@
               </el-option>
           </el-select>
         </el-form-item>
+
+        
         
          <el-form-item label="生产厂商" prop="factory">
           <el-input v-model="equipment.factory" placeholder="生产厂商" />
@@ -220,6 +239,18 @@ export default {
       equipmentList: {
         count: 0,
       },
+       type_: {
+           '1':'生产设备',
+           '2':'检验工具',
+        
+        },
+      typeoptions: [{
+          value: 1,
+          label: '生产设备'
+        }, {
+          value: 2,
+          label: '检验工具'
+        }],
       options: [{
           value: 0,
           label: '运转正常'
@@ -242,6 +273,7 @@ export default {
       rule1: {
         name: [{ required: true, message: "请输入", trigger: "blur" }],
         number: [{ required: true, message: "请输入", trigger: "blur" }],
+          type: [{ required: true, message: "请输入", trigger: "blur" }],
         model: [{ required: true, message: "请输入", trigger: "blur" }],
         state: [{ required: true, message: "请选择", trigger: "blur" }],
         belong_dept:[{ required: true, message: "请选择", trigger: "blur" }]
@@ -270,7 +302,7 @@ export default {
      //组员列表
     getUserList() {
       getUserList({pageoff:true}).then((res) => {
-        this.keeperOptions = genTree(res.data.results);
+        this.keeperOptions = genTree(res.data);
       });
     },
   //部门列表

hb_client/src/views/inm/warehouse.vue

@@ -52,7 +52,9 @@
           <template slot-scope="scope">{{ scope.row.place }}</template>
         </el-table-column>
       
-
+  <el-table-column label="创建时间">
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        </el-table-column>
         <el-table-column
           align="center"
           label="操作"

hb_client/src/views/mtm/material.vue

@@ -59,7 +59,9 @@
         <el-table-column label="计量单位">
           <template slot-scope="scope">{{ scope.row.unit }}</template>
         </el-table-column>
-     
+       <el-table-column label="创建时间">
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        </el-table-column>
 
         <el-table-column
           align="center"
@@ -120,7 +122,7 @@
       
           <el-form-item label="物料类别" prop="type">
          
-           <el-select  style="width: 100%" v-model="material.type" placeholder="请选择">
+           <el-select  style="width: 100%" v-model="material.type" placeholder="请选择" >
              <el-option
                 v-for="item in options"
                 :key="item.value"
@@ -129,7 +131,7 @@
               </el-option>
           </el-select>
         </el-form-item>
-         <el-form-item label="绑定工序" prop="processes">
+         <el-form-item label="绑定工序"  prop="processes" v-if="material.type==1">
          <el-transfer
             v-model="material.processes"
             :data="processOptions"
@@ -229,6 +231,7 @@ export default {
         this.listLoading = false;
       });
     },
+   
     //工序清单
  getProcessList() {
       getProcessList().then((res) => {

hb_client/src/views/mtm/process.vue

@@ -34,6 +34,9 @@
           <template slot-scope="scope" v-if="scope.row.instruction_">
             <el-link :href="scope.row.instruction_.path" >{{scope.row.instruction_.name}}</el-link>
           </template>
+        </el-table-column>
+          <el-table-column label="创建时间">
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
         </el-table-column>
         <el-table-column
           align="center"

hb_client/src/views/mtm/step.vue

@@ -237,7 +237,9 @@
           <template slot-scope="scope">{{ scope.row.field_choice }}</template>
         </el-table-column>
        
-      
+        <el-table-column label="创建时间">
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        </el-table-column>
            <el-table-column
           align="center"
           label="操作"

hb_client/src/views/procurement/vendor.vue

@@ -58,7 +58,9 @@
         <el-table-column label="备注">
           <template slot-scope="scope">{{ scope.row.description }}</template>
         </el-table-column>
-
+  <el-table-column label="创建时间">
+          <template slot-scope="scope">{{ scope.row.create_time }}</template>
+        </el-table-column>
         <el-table-column
           align="center"
           label="操作"