Merge branch 'xiaozy_产品列表' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin into lixuan

src/views/order/components/billOfLading.vue

@@ -105,7 +105,7 @@
     </div>
     <div class="buttons">
       <el-button @click="controlWindows.bill = false">取消 </el-button>
-      <el-button @click="submit">订单确认</el-button>
+      <el-button v-show="billData.orderInfo.orderStatus=='PLATENUM_SUCCESS'"  @click="submit">订单确认</el-button>
     </div>
     <el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息" width="400px" :visible.sync="dialogBillAdd">
       <el-form v-if="dialogBillAdd" :model="billAddData" ref="form" :rules="rules">
@@ -258,6 +258,8 @@ export default {
         case 'SUBMITED': return {orderLabel:'订单提交',label:'等待信息',info:'等待信息锁定',type:'warning',type1:'info',orderType:'info'}
         case 'PLATENUM_LOCKED': return {orderLabel:'下单中',label:'信息锁定',info:'提货信息确认',type:'info',type1:'success',orderType:'warning'}
         case 'PLATENUM_SUCCESS': return {orderLabel:'下单成功',label:'提货中',info:'提货量确认',type:'',type1:'warning',orderType:''}
+        case 'ORDER_LOCKED': return {orderLabel:'下单中',label:'信息锁定',info:'提货信息确认',type:'info',type1:'success',orderType:'warning'}
+        case 'ORDER_SUCCESS': return {orderLabel:'下单成功',label:'提货中',info:'提货量确认',type:'',type1:'warning',orderType:''}
         case 'DELIVERING': return {orderLabel:'提货中',label:'提货中', type: ''}
         case 'COMPLETE': return {orderLabel:'订单完成',label:'提货完成',info:'提货完成',type:'success',type1:'info',orderType:'success'}
         case 'CANCELED': return {orderLabel:'订单取消',label:'订单取消',info:'订单取消',type:'info',type1:'dark',orderType:'info'}

src/views/order/index.vue

@@ -22,7 +22,13 @@
         :params="parameter.params"
         :config="configAutocompleteLc"
       />
-      <el-select v-model="parameter.params.id" placeholder="产品名称" clearable>
+      <!-- 产品名称 -->
+      <autocomplete
+        class="mr20"
+        :params="parameter.params"
+        :config="configAutocompleteCp"
+      />
+      <!-- <el-select v-model="parameter.params.id" placeholder="产品名称" clearable>
         <el-option
           v-for="item in refineryList"
           :key="item.id"
@@ -30,7 +36,7 @@
           :value="item.id"
         >
         </el-option>
-      </el-select>
+      </el-select> -->
       <div class="buttons">
         <el-button icon="el-icon-search" @click="handleCurrentChange(1)"
           >查询</el-button
@@ -222,6 +228,14 @@ export default {
         placeholder: "炼厂名称",
         querykey: "refineryId",
       },
+      configAutocompleteCp: {
+        serveTarget: serve.findByEntity,
+        autocompleteKey: "name",
+        labelKey: "refineryName",
+        valueKey: "id",
+        placeholder: "产品名称",
+        querykey: "refineryId",
+      },
       refineryTypeEnum: [
         {
           label: "普通炼厂",
@@ -328,13 +342,17 @@ export default {
     //下单取消
     orderCencle(row){
       if(row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'){
-        order.update({id:row.id,orderStatus:'CANCELED'}).then((res) => {
+        order.orderUpdate({id:row.id,orderStatus:'CANCELED'}).then((res) => {
           if(res.code==20000){
             this.getByPage()
           }
         });
       }else{
-
+        order.orderRefund({id:row.id}).then((res) => {
+          if(res.code==20000){
+            this.getByPage()
+          }
+        });
       }
     },
     //新增