Merge remote-tracking branch 'origin/dev_New' into dev_New

gaoluyang

11 小时以前 df503cdf3ef869d803c829bd1e901fe318eb7515

Merge remote-tracking branch 'origin/dev_New' into dev_New

 src/views/productionManagement/productionCosting/index.vue

@@ -181,7 +181,7 @@
        type: "warning",
    })
        .then(() => {
            proxy.download("/basic/customer/export", {}, "生产核算.xlsx");
            proxy.download("/salesLedger/productionAccounting/export", {}, "生产核算.xlsx");
        })
        .catch(() => {
            proxy.$modal.msg("已取消");

 src/views/productionManagement/productionOrder/index.vue

@@ -133,7 +133,7 @@
    {
      label: "工艺路线编号",
      prop: "processRouteCode",
      width: '140px',
      width: '200px',
    },
    {
      label: "需求数量",

 src/views/productionManagement/productionReporting/index.vue

@@ -19,21 +19,6 @@
                    style="width: 200px;"
                    @change="handleQuery" />
        </el-form-item>
        <el-form-item label="工单状态:">
          <el-select v-model="searchForm.workOrderStatus"
                     placeholder="请选择工单状态"
                     style="width: 140px"
                     clearable>
            <el-option label="待确认"
                       :value="1"></el-option>
            <el-option label="待生产"
                       :value="2"></el-option>
            <el-option label="生产中"
                       :value="3"></el-option>
            <el-option label="已生产"
                       :value="4"></el-option>
          </el-select>
        </el-form-item>
        <el-form-item>
          <el-button type="primary"
                     @click="handleQuery">搜索</el-button>
@@ -416,7 +401,7 @@
      type: "warning",
    })
      .then(() => {
        proxy.download("/salesLedger/work/export", {}, "生产报工.xlsx");
        proxy.download("/productionProductMain/export", {}, "生产报工.xlsx");
      })
      .catch(() => {
        proxy.$modal.msg("已取消");