Bläddra i källkod

禅道bug 741 787 修复 采购申请生产计划增加查询字段

jingshuyong 10 månader sedan
förälder
incheckning
215ce37365

+ 1 - 2
src/views/materialPlan/components/produceOrder.vue

@@ -382,6 +382,7 @@
         console.log(where);
         const data = await getList({
           ...where,
+          splitBatch: 0,
           pageNum: page,
           size: limit
         });
@@ -391,8 +392,6 @@
 
       /* 刷新表格 */
       reload(where) {
-        console.log(1313);
-        console.log(where);
         this.$nextTick(() => {
           if (this.$refs.table && this.$refs.table.reload)
             this.$refs.table.reload({ page: 1, where: where });

+ 7 - 3
src/views/productionPlan/components/detail/plan.vue

@@ -60,8 +60,10 @@
       > -->
       <el-descriptions-item
         :label="`要求生产重量(${productionPlan.weightUnit})`"
-        >{{ productionPlan.requiredFormingWeight }}</el-descriptions-item
       >
+        <!-- {{ productionPlan.requiredFormingWeight }} -->
+        {{ productionPlan.newSumOrderWeight }}
+      </el-descriptions-item>
       <el-descriptions-item label="使用改型">{{
         productionPlan.modification ? '是' : '否'
       }}</el-descriptions-item>
@@ -141,7 +143,9 @@
         </template>
         <template v-slot:headerContractNum="{ column }">
           <div class="header_required"
-            ><span class="is-required">{{ column.label + `(${productionPlan.measuringUnit})` }}</span></div
+            ><span class="is-required">{{
+              column.label + `(${productionPlan.measuringUnit})`
+            }}</span></div
           >
         </template>
       </ele-pro-table>
@@ -185,7 +189,7 @@
           {
             prop: 'contractNum',
             slot: 'contractNum',
-             headerSlot: 'headerContractNum',
+            headerSlot: 'headerContractNum',
             label: `订单数量`
           },
           {

+ 6 - 3
src/views/saleOrder/components/order-detail.vue

@@ -45,8 +45,9 @@
         </el-descriptions-item>
         <el-descriptions-item>
           <template slot="label"> 订单重量 </template>
-          {{ form.salesOrderBasicInfo.productSumWeight }}
-          {{ form.salesOrderBasicInfo.weightUnit }}
+          {{ orderWeight }}
+          <!-- {{ form.salesOrderBasicInfo.productSumWeight }}
+          {{ form.salesOrderBasicInfo.weightUnit }} -->
         </el-descriptions-item>
         <!--        <el-descriptions-item>
           <template slot="label"> 已交货重量 </template>
@@ -302,7 +303,8 @@
           productSpecRequirement: {},
           salesOrderAllProductsList: [],
           salesOrderBasicInfo: {}
-        }
+        },
+        orderWeight: ''
       };
     },
     computed: {
@@ -325,6 +327,7 @@
     methods: {
       open(row) {
         this.getDetail(row.id);
+        this.orderWeight = `${row.productSumWeight}${row.weightUnit}`;
         this.visible = true;
       },
       getDetail(id) {