feat: 页面修改

src/views/mtm/materials_form.vue

@@ -1,52 +1,36 @@
 <template>
-  <el-dialog
+  <el-dialog :title="titleMap[mode]" v-model="visible" :size="1000" destroy-on-close @closed="$emit('closed')">
-    :title="titleMap[mode]"
-    v-model="visible"
-    :size="1000"
-    destroy-on-close
-    @closed="$emit('closed')"
-  >
     <el-container v-loading="loading">
       <el-main style="padding: 0 20px 20px 20px">
-        <el-form
+        <el-form ref="dialogForm" :model="form" :rules="rules" label-width="120px">
-          ref="dialogForm"
-          :model="form"
-          :rules="rules"
-          label-width="120px"
-        >
           <el-row>
             <el-col :md="12" :sm="24">
               <el-form-item label="物料编号" prop="number">
-                <el-input v-model="form.number" placeholder="物料编号"/>
+                <el-input v-model="form.number" placeholder="物料编号" />
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24" prop="name">
               <el-form-item label="物料名称">
-                <el-input v-model="form.name" placeholder="物料名称"/>
+                <el-input v-model="form.name" placeholder="物料名称" />
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="规格型号">
-                <el-input v-model="form.specification" placeholder="规格型号"/>
+                <el-input v-model="form.specification" placeholder="规格型号" />
               </el-form-item>
             </el-col>
             <el-col :md="12" :sm="24">
               <el-form-item label="物料类别" prop="type">
-                <el-select
+                <el-select v-model="form.type" placeholder="物料类别" clearable style="width:100%">
-                  v-model="form.type"
+                  <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id"></el-option>
-                  placeholder="物料类别"
-                  clearable
-                  style="width:100%"
-                >
-                  <el-option
-                  v-for="item in options"
-                  :key="item.id"
-                  :label="item.name"
-                  :value="item.id"
-                  ></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
+            <el-col :md="12" :sm="24">
+              <el-form-item label="工艺路线" prop="need_route">
+                <el-switch v-model="form.need_route" />
+              </el-form-item>
+            </el-col>
             <!-- <el-col :md="12" :sm="24">
               <el-form-item label="计量单位" prop="unit">
                 <el-select
@@ -88,20 +72,20 @@ export default {
       },
       form: {},
       rules: {
-          name: [{required: true, message: "请输入物料名称", trigger: "blur"}],
+        name: [{ required: true, message: "请输入物料名称", trigger: "blur" }],
-          number: [{required: true, message: "请输入物料编号", trigger: "blur"}],
+        number: [{ required: true, message: "请输入物料编号", trigger: "blur" }],
-        },
+      },
       visible: false,
       isSaveing: false,
       options: [
-        {id:0,name:'电/水/气'},
+        { id: 0, name: '电/水/气' },
-        {id:10,name:'成品'},
+        { id: 10, name: '成品' },
-        {id:20,name:'半成品'},
+        { id: 20, name: '半成品' },
-        {id:30,name:'主要原料'},
+        { id: 30, name: '主要原料' },
-        {id:40,name:'辅助材料'},
+        { id: 40, name: '辅助材料' },
-        {id:50,name:'加工工具'},
+        { id: 50, name: '加工工具' },
-        {id:60,name:'辅助工装'},
+        { id: 60, name: '辅助工装' },
-        {id:70,name:'办公用品'},
+        { id: 70, name: '办公用品' },
       ],
       selectionFilters: [],
       setFiltersVisible: false,
@@ -111,7 +95,7 @@ export default {
   },
   methods: {
     //显示
-    open(mode = "add",type) {
+    open(mode = "add", type) {
       this.mode = mode;
       this.visible = true;
       return this;
@@ -126,7 +110,7 @@ export default {
             if (this.mode == "add") {
               res = await this.$API.mtm.material.create.req(this.form);
             } else if (this.mode == "edit") {
-              res = await this.$API.mtm.material.update.req(this.form.id,this.form);
+              res = await this.$API.mtm.material.update.req(this.form.id, this.form);
             }
             this.isSaveing = false;
             this.$emit("success", this.form, this.mode);
@@ -152,5 +136,4 @@ export default {
   },
 };
 </script>
-<style>
+<style></style>
-</style>

src/views/mtm/route.vue

@@ -178,7 +178,7 @@ export default {
             })
         },
         getProducts() {
-            this.$API.mtm.material.list.req({ page: 0, type: 10, is_assemb: false }).then(res => {
+            this.$API.mtm.material.list.req({ page: 0, need_route: true }).then(res => {
                 res.forEach(m => {
                     m.label = m.name
                 })

src/views/sam/order.vue

@@ -25,7 +25,7 @@
         </el-table-column>
         <el-table-column label="截止到货日期" prop="delivery_date">
         </el-table-column>
-        <el-table-column label="提交时间" prop="submit_time">
+        <el-table-column label="提交时间" prop="submit_time" width="160">
         </el-table-column>
         <el-table-column label="创建人" prop="create_by_name">
         </el-table-column>