Fix: 技术确定问题

src/views/modules/order/order.vue

@@ -9,6 +9,19 @@
         <el-form-item label="合同号">
           <el-input v-model="dataForm.contractNumber" placeholder="合同号" clearable></el-input>
         </el-form-item>
+        <el-form-item label="订单状态" prop="orderState">
+          <el-select
+            v-model="dataForm.orderState"
+            remote
+            placeholder="请选择">
+            <el-option
+              v-for="item in optionsOrderState"
+              :key="item.code"
+              :label="item.value"
+              :value="item.code">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="创建日期">
           <el-date-picker
             v-model="dataForm.createTime"
@@ -83,6 +96,7 @@
           prop="-"
           header-align="center"
           align="center"
+          min-width="120"
           :formatter="formatState"
           label="审批状态">
         </el-table-column>
@@ -90,6 +104,7 @@
           prop="-"
           header-align="center"
           align="center"
+          min-width="120"
           :formatter="formatOrderState"
           label="订单状态">
         </el-table-column>
@@ -125,7 +140,7 @@
           <template slot-scope="scope">
             <el-button v-if="isAuth('order:ctl:info')" type="text" size="small" @click="detailHandle(scope.row.orderId)">查看</el-button>
             <el-button v-if="isAuth('order:ctl:editor') && Number(scope.row.state) === 1" type="text" size="small" @click="addOrUpdateHandle(scope.row.orderId,false)">编辑</el-button>
-            <el-button v-if="isAuth('order:ctl:determine') && Number(scope.row.state) === 1" type="text" size="small" @click="techConfirm(scope.row)">技术确定</el-button>
+            <el-button v-if="isAuth('order:ctl:determine') && Number(scope.row.state) === 3" type="text" size="small" @click="techConfirm(scope.row)">技术确定</el-button>
 <!--            <el-button v-if="isAuth('order:ctl:deliver') && Number(scope.row.orderState) === 3" type="text" size="small" @click="deliverHandle(scope.row.orderId)">发货</el-button>-->
 <!--            <el-button v-if="isAuth('order:ctl:arrived') && Number(scope.row.orderState) === 4 " type="text" size="small" @click="arrivedHandle(scope.row)">送达</el-button>-->
           </template>
@@ -195,6 +210,9 @@
           },
           {
             code: '5', value: '已送达'
+          },
+          {
+            code: '6', value: '技术待确定'
           }
         ],
         optionsCustomer: []
@@ -221,7 +239,7 @@
           'createTime': this.dataForm.createTime ? this.dataForm.createTime : null,
           'contractNumber': this.dataForm.contractNumber ? this.dataForm.contractNumber : null,
           'customerId': this.dataForm.customerId ? this.dataForm.customerId : null,
-          'state': this.dataForm.state ? this.dataForm.state : null
+          'orderState': this.dataForm.orderState ? this.dataForm.orderState : null
         }
         getOrderList(params).then(({data}) => {
           if (data && data.code === '200') {