zhangqing 1 жил өмнө
parent
commit
0bfcaafec5

+ 11 - 11
src/views/aps/presalesorder/index.vue

@@ -95,13 +95,13 @@
 
           <el-row>
             <el-col :span="8">
-              <el-form-item label="主机描述" prop="productDescription">
-                <el-input v-model="form.productDescription" type="textarea" placeholder="请输入内容" />
+              <el-form-item label="主机描述" prop="hostDescription">
+                <el-input v-model="form.hostDescription" type="textarea" placeholder="请输入主机描述" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
-              <el-form-item label="主机编码" prop="productCode">
-                <el-input v-model="form.productCode" placeholder="请输入产品编码" />
+              <el-form-item label="主机编码" prop="hostCode">
+                <el-input v-model="form.hostCode" placeholder="请输入主机编码" />
               </el-form-item>
             </el-col>
             <el-col :span="8">
@@ -113,7 +113,7 @@
 
           <el-row>
             <el-col :span="8">
-              <el-form-item label="物料重量" prop="materialWeightKg">
+              <el-form-item label="重量" prop="materialWeightKg">
                 <el-input v-model="form.materialWeightKg" placeholder="请输入物料重量" />
               </el-form-item>
             </el-col>
@@ -321,14 +321,14 @@ export default {
           width: 140,
         },
         {
-          prop: 'productDescription',
+          prop: 'hostDescription',
           label: '主机描述',
           showOverflowTooltip: true,
           align: 'center',
           width: 140,
         },
         {
-          prop: 'productCode',
+          prop: 'hostCode',
           label: '主机编码',
           showOverflowTooltip: true,
           align: 'center',
@@ -415,14 +415,14 @@ export default {
           align: 'center',
         },
         {
-          prop: 'materialUnit',
-          label: '物料单位',
+          prop: 'materialWeightKg',
+          label: '重量(kg)',
           showOverflowTooltip: true,
           align: 'center',
         },
         {
-          prop: 'materialWeightKg',
-          label: '物料重量(kg)',
+          prop: 'materialUnit',
+          label: '单位',
           showOverflowTooltip: true,
           align: 'center',
         },

+ 10 - 27
src/views/aps/transferred/index.vue

@@ -295,37 +295,19 @@ export default {
           width: 140,
         },
         {
-          prop: 'productDescription',
-          label: '产品描述',
+          prop: 'hostDescription',
+          label: '主机描述',
           showOverflowTooltip: true,
           align: 'center',
           width: 140,
         },
         {
-          prop: 'productCode',
-          label: '产品编码',
+          prop: 'hostCode',
+          label: '主机编码',
           showOverflowTooltip: true,
           align: 'center',
           width: 140,
         },
-        {
-          prop: 'orderQuantity',
-          label: '订单数量',
-          showOverflowTooltip: true,
-          align: 'center',
-        },
-        {
-          prop: 'unit',
-          label: '单位',
-          showOverflowTooltip: true,
-          align: 'center',
-        },
-        {
-          prop: 'weightKg',
-          label: '重量',
-          showOverflowTooltip: true,
-          align: 'center',
-        },
         {
           prop: 'customerDeliveryDate',
           label: '客户交期',
@@ -370,22 +352,23 @@ export default {
         },
         {
           prop: 'materialQuantity',
-          label: '物料数量',
+          label: '数量',
           showOverflowTooltip: true,
           align: 'center',
         },
         {
-          prop: 'materialUnit',
-          label: '物料单位',
+          prop: 'materialWeightKg',
+          label: '重量(kg)',
           showOverflowTooltip: true,
           align: 'center',
         },
         {
-          prop: 'materialWeightKg',
-          label: '物料重量(kg)',
+          prop: 'materialUnit',
+          label: '单位',
           showOverflowTooltip: true,
           align: 'center',
         },
+        
         // {
         //   prop: 'status',
         //   slot: 'status',