Merge remote-tracking branch 'origin/xiaozy_产品列表'

Reviewed-on: #4

src/views/order/components/billOfLading.vue

@@ -104,7 +104,7 @@
       </el-form>
     </div>
     <div class="buttons">
-      <el-button @click="controlWindows.bill = false">取消 </el-button>
+      <el-button @click="closeWindow()">取消 </el-button>
       <el-button v-show="billData.orderInfo&&billData.orderInfo.orderStatus&&billData.orderInfo.orderStatus=='DELIVERING'"  @click="submit">订单确认</el-button>
     </div>
     <el-dialog :close-on-click-modal="false" :append-to-body="true" title="提货单信息" width="400px" :visible.sync="dialogBillAdd">
@@ -286,7 +286,6 @@ export default {
              order.billSave(this.billAddData).then(res=>{
               if(res.code == 20000){
                 this.billAddData.deliveryStatus = 'SUBMITED'
-                this.billData.list.push(this.billAddData)
                 this.billListMeth()
                 this.$message.success(res.msg)
                 this.dialogBillAdd = false
@@ -305,14 +304,19 @@ export default {
           }
         }
       })
+      this.$emit('billOfLading',this.billAddData.orderId)
     },
     //更新提货单数据
     billListMeth(){
       setTimeout(()=>{
         order.findDeliveryByOrderId(this.controlWindows.addInfo.id).then((res) => {
           this.billData.list = res.data
-            this.$forceUpdate() 
+          this.$forceUpdate() 
         });
+        order.findByOrderId(this.controlWindows.addInfo.id).then((res) => {
+          this.billData.orderInfo = res.data
+          this.$forceUpdate() 
+      });
       },200)
     },
     //删除提货单
@@ -325,7 +329,6 @@ export default {
             this.billListMeth()
           }
         })
-        this.$set(this.billData.list,index,'')
       })
     },
     openDrawer() {
@@ -348,18 +351,34 @@ export default {
           throw new Error()
         }
       });
-      this.$confirm('确定下单?', '提示', { type: 'success' }).then(() => {
-        let data={
+      let titleConfirm = ['是否确认订单已完成？','一旦确认，该订单无法再被提货，且未提货的金额将自行退回。']
+      const newDatas = []
+      const h = this.$createElement
+      for (const i in titleConfirm) {
+        newDatas.push(h('p', null, titleConfirm[i]))
+      }
+      this.$confirm(
+          '提示',
+          {
+            title: '提示',
+            message: h('div', null, newDatas),
+            showCancelButton: true,
+            confirmButtonText: '确定',
+            cancelButtonText: '取消',
+            type: 'success'
+          }
+        ).then(() => {
+          let data={
           id:this.controlWindows.addInfo.id,
           actQuantity:this.quantity,
         }
-        order.orderComplete(data).then((res) => {
+          order.orderComplete(data).then((res) => {
             if (res.code === 20000) {
               this.$message.success(res.msg);
               this.closeWindow();
             }
           });
-      })  
+        })
     },
     judgeInterface(form) {
       // let { id } = this.controlWindows.addInfo;
@@ -371,7 +390,6 @@ export default {
       this.$emit("closeWindow");
       this.form = {};
       this.controlWindows.bill = false;
-      this.$refs.form.clearValidate();
     },
   },
 };

src/views/order/index.vue

@@ -134,7 +134,7 @@
             <el-link type="primary" :underline="false" @click="detail(row)"
               >详情</el-link
             >
-            <el-link v-show="row.orderStatus!=='SUBMITED'&&row.orderStatus!=='ORDER_LOCKED'&&row.payStatus!=='REFUNDED'" type="primary" :underline="false" @click="billOfLading(row)"
+            <el-link v-show="row.orderStatus!=='SUBMITED'&&row.orderStatus!=='ORDER_LOCKED'" type="primary" :underline="false" @click="billOfLading(row)"
               >提货单</el-link
             >
             <el-popconfirm

src/views/refineryAccount/index.vue

@@ -36,7 +36,7 @@
     <div class="table">
       <div class="operation">
         <!-- <el-button @click="addition">新增炼厂账户</el-button> -->
-        <el-button @click="addition">充值</el-button>
+        <!-- <el-button @click="addition">充值</el-button> -->
       </div>
       <el-table
         v-if="tableHeight"