Merge branch 'dev_JTWY' of http://114.132.189.42:9002/r/TianJin-product-man...

chenhj

7 小时以前 bf04a3d97228529c11b2e84e8de7502519882236

Merge branch 'dev_JTWY' of http://114.132.189.42:9002/r/TianJin-product-management into dev_JTWY

 src/views/basicData/product/ProductSelectDialog.vue

@@ -147,8 +147,8 @@
    const res = await productModelList({
      productName: query.productName.trim(),
      model: query.model.trim(),
      pageNum: page.pageNum,
      pageSize: page.pageSize,
      current: page.pageNum,
      size: page.pageSize,
    });
    tableData.value = res.records;
    total.value = res.total;

 src/views/productionManagement/processRoute/Edit.vue

@@ -2,7 +2,7 @@
  <div>
    <el-dialog
        v-model="isShow"
        title="编辑工序"
        title="编辑工艺路线"
        width="400"
        @close="closeModal"
    >

 src/views/productionManagement/processRoute/index.vue

@@ -48,7 +48,6 @@
        :record="record"
        @completed="getList"
    />
    RouteItemForm
    </div>
</template>