配料计划

src/views/materialPlan/components/plan-edit-dialog.vue

@@ -69,8 +69,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="计划备注" prop="remark">
-            <el-input v-model="formData.remark"></el-input>
+          <el-form-item label="计划备注" prop="notes">
+            <el-input v-model="formData.notes"></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -133,7 +133,7 @@
         formData: {
           deliveryTime: '',
           num: '',
-          remark: '',
+          notes: '',
           categoryId: '',
           unit: '',
           brandNo: '',

src/views/materialPlan/index.vue

@@ -29,7 +29,7 @@
       >
         <template v-slot:code="{ row }">
           <el-link type="primary" :underline="false" @click="goDetail(row)">
-            222222
+            {{ row.code }}
           </el-link>
         </template>
         <!-- 操作列 -->
@@ -204,7 +204,13 @@
             label: '状态',
             align: 'center',
             showOverflowTooltip: true,
-            minWidth: 110
+            minWidth: 110,
+            formatter: (row) => {
+              const obj = this.statusOpt[this.activeName].find(
+                (i) => i.value == row.status
+              );
+              return obj && obj.label;
+            }
           },
           {
             prop: 'createUserName',