订单状态；生产计划新增计划编码；

src/views/aps/presalesorder/index.vue

@@ -13,8 +13,8 @@
             size="mini" :disabled="multiple" @click="handleDelete">删除</el-button>
           <!-- <el-button style="background-color: #ec407a;color: white;border-color: #ec407a" icon="el-icon-download"
             size="mini" :disabled="single" @click="handleExpect">交期预估</el-button> -->
-          <el-button style="background-color: #cddc39;color: white;border-color: #cddc39" icon="el-icon-download"
-            size="mini" :disabled="multiple" @click="handleAllExpect">全部预估</el-button>
+          <!-- <el-button style="background-color: #cddc39;color: white;border-color: #cddc39" icon="el-icon-download"
+            size="mini" :disabled="multiple" @click="handleAllExpect">全部预估</el-button> -->
           <el-button style="background-color: #ec407a;color: white;border-color: #ec407a" icon="el-icon-download"
             size="mini" @click="importTemplate">下载模板</el-button>
           <el-button type="info" icon="el-icon-upload2" size="mini" @click="handleImport">导入</el-button>
@@ -25,7 +25,7 @@
             @click="handleAllSaleorder">一次性转销售订单</el-button> -->
         </template>
         <template v-slot:status="{ row }">
-          {{ row.status == 1 ? '启用' : '停用' }}
+          {{ row.status == 0 ? '未预估' : row.status == 1 ? '已预估' : '已转销售单' }}
         </template>
 
         <!-- 操作列 -->
@@ -48,23 +48,23 @@
 
 
 
-<!-- 添加或修改销售订单对话框 -->
+      <!-- 添加或修改销售订单对话框 -->
       <ele-modal :title="titleExpect" :visible.sync="openExpect" :before-close="cancelExpect"
-      :close-on-click-modal="false" :close-on-press-escape="false" append-to-body width="70%" :maxable="true">
-      <el-table v-loading="loading" :data="salesorderExpectList" >
-        <el-table-column label="序号" align="center" prop="id" />
-        <el-table-column label="年份" align="center" prop="year" />
-        <el-table-column label="月份" align="center" prop="month" />
-        <el-table-column label="日期" align="center" prop="day" />
-        <el-table-column label="预计交付日期" align="center" prop="deliverDay" />
-        <el-table-column label="规划产能(吨)" align="center" prop="plannedCapacity" />
-        <el-table-column label="已排产产能" align="center" prop="plannedSumCapacity" />
-        <el-table-column label="未排产产能" align="center" prop="unplannedSumCapacity" />
-        <el-table-column label="本次排产产能" align="center" prop="currentPlannedSumCapacity" />
-        <el-table-column label="已排产单号列表" align="center" prop="plannedOrder" />
-        <el-table-column label="已排产产能列表" align="center" prop="plannedOrderCapacity" />
-      </el-table>
-      <div slot="footer" class="dialog-footer">
+        :close-on-click-modal="false" :close-on-press-escape="false" append-to-body width="70%" :maxable="true">
+        <el-table v-loading="loading" :data="salesOrderExpectList">
+          <el-table-column label="序号" align="center" prop="id" />
+          <el-table-column label="年份" align="center" prop="year" />
+          <el-table-column label="月份" align="center" prop="month" />
+          <el-table-column label="日期" align="center" prop="day" />
+          <el-table-column label="预计交付日期" align="center" prop="deliverDay" />
+          <el-table-column label="规划产能(吨)" align="center" prop="plannedCapacity" />
+          <el-table-column label="已排产产能" align="center" prop="plannedSumCapacity" />
+          <el-table-column label="未排产产能" align="center" prop="unplannedSumCapacity" />
+          <el-table-column label="本次排产产能" align="center" prop="currentPlannedSumCapacity" />
+          <el-table-column label="已排产单号列表" align="center" prop="plannedOrder" />
+          <el-table-column label="已排产产能列表" align="center" prop="plannedOrderCapacity" />
+        </el-table>
+        <div slot="footer" class="dialog-footer">
           <el-button type="primary" :disabled="single" @click="submitFormExpect">确定交期</el-button>
           <el-button type="primary" :disabled="multiple" @click="submitFormAllExpect">确定所有交期</el-button>
           <el-button @click="cancelExpect">取 消</el-button>
@@ -365,6 +365,7 @@ export default {
         {
           prop: 'status',
           slot: 'status',
+          width: 120,
           label: '订单状态',
           showOverflowTooltip: true,
           align: 'center',
@@ -446,7 +447,7 @@ export default {
       console.log(this.ids, 'selection')
       this.single = selection.length !== 1;
       this.multiple = !selection.length;
-    
+
 
 
       // if (selection.length == 1) {
@@ -541,16 +542,16 @@ export default {
       });
     },
     //全部预估
-    handleAllExpect() {
+    // handleAllExpect() {
 
-      listSalesorderExpectAll().then(response => {
+    //   listSalesorderExpectAll().then(response => {
 
-        this.salesOrderExpectList = response;
-        this.openExpect = true;
-        this.single = true;
-        this.multiple = false;
-      });
-    },
+    //     this.salesOrderExpectList = response;
+    //     this.openExpect = true;
+    //     this.single = true;
+    //     this.multiple = false;
+    //   });
+    // },
     /** 导入按钮操作 */
     handleImport() {
       this.upload.title = "销售订单数据导入";
@@ -621,6 +622,9 @@ export default {
           this.$message.success("转换成功");
           this.reload();
         });
+      } else {
+        this.$message.warning("请选择状态为未提交的数据！");
+        return;
       }
 
 

src/views/aps/presalesorder/search.vue

@@ -25,7 +25,12 @@
       </el-col>
       <el-col :span="4">
         <el-form-item label="订单状态" prop="status">
-          <el-switch v-model="where.status" :active-value="1" :inactive-value="0" @change="search"></el-switch>
+          <el-select v-model="where.status" placeholder="请选择订单状态" clearable @change="search">
+            <el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+
+          <!-- <el-switch v-model="where.status" :active-value="1" :inactive-value="0" @change="search"></el-switch> -->
         </el-form-item>
       </el-col>
       <el-col style="display: flex; justify-content: flex-end" :span="4">
@@ -56,6 +61,20 @@ export default {
       defaultWhere,
       // 表单数据
       where: { ...defaultWhere },
+      statusOptions: [
+        {
+          value: '0',
+          label: '未预估'
+        },
+        {
+          value: '1',
+          label: '已预估'
+        },
+        {
+          value: '2',
+          label: '已转销售单'
+        }
+      ]
     };
   },
   computed: {

src/views/materialPlan/components/producePlan.vue

@@ -325,6 +325,14 @@ export default {
         //     return row.purchaseType == '1' ? '未采购' : '已采购';
         //   }
         // },
+        {
+          prop: 'planCode',
+          label: '计划编号',
+          showOverflowTooltip: true,
+          align: 'center',
+          minWidth: 170,
+          sortable: true
+        },
         {
           prop: 'code',
           label: '销售订单号',

src/views/materialPlan/components/saleOrderPop.vue

@@ -60,7 +60,7 @@ export default {
             }
           },
           formatter: (row) => {
-            return row.purchaseType == '1' ? '未采购' : row.purchaseType == '2' ? '已采购' : '';
+            return row.purchaseType == '2' ? '已采购' : '未采购';
           }
         },
         {