Merge branch 'master' of http://121.196.213.68:3000/xiaozhiyong/refinery-admin

Reviewed-on: #6

src/utils/request.js

@@ -21,7 +21,7 @@ service.interceptors.request.use(
     const JSESSIONID = utils.uuid();
     config.headers["JSESSIONID"] = JSESSIONID;
     config.headers["token"] = utils.bcrypt(JSESSIONID);
-
+    config.headers['dataSources'] = 'WEB'
     if (env === "development") {
       return config;
     }

src/views/customerManagement/companyManagement/index.vue

@@ -28,7 +28,7 @@
           clearable
         >
           <el-option
-            v-for="(item, index) in companyNatureTypeEnum"
+            v-for="(item, index) in companyNatureTypeEnum.slice(1)"
             :key="index"
             :label="item.label"
             :value="item.value"
@@ -49,7 +49,7 @@
           clearable
         >
           <el-option
-            v-for="(item, index) in auditMarkEnum"
+            v-for="(item, index) in auditMarkEnum.slice(1)"
             :key="index"
             :label="item.label"
             :value="item.value"
@@ -300,7 +300,7 @@
     <!-- 新增 -->
     <add
       :controlWindows="controlWindows"
-      :companyNatureTypeEnum="companyNatureTypeEnum"
+      :companyNatureTypeEnum="companyNatureTypeEnum.slice(1)"
       @closeWindow="search"
     />
     <!-- 认证 -->
@@ -332,16 +332,17 @@
           </p>
         </template>
         <template #companyNature>
-          <p v-if="oilCompanyMatch[0]">
+          <p>
-            {{
+            <!-- {{
-              companyNatureEnum.find(
+              companyNatureTypeEnum.find(
                 (item) => item.value === oilCompanyMatch[0].companyNature
               ).label
-            }}
+            }} -->
           </p>
         </template>
         <template #companyDockType>
-          <p>
+          <p v-if="oilCompanyMatch[0].companyDockType === null"></p>
+          <p v-else>
             {{
               oilCompanyMatch[0].companyDockType == 0 ? "对接客户" : "平台客户"
             }}
@@ -356,7 +357,7 @@
           <p>
             {{
               auditMarkEnum.find(
-                (item) => item.value == oilCompanyMatch[0].enableMark
+                (item) => item.value == oilCompanyMatch[0].auditMark
               ).label
             }}
           </p>
@@ -386,7 +387,7 @@
         <template #accountState>
           <p v-if="oilCompanyMatch[3]">
             {{
-              accountStatusEnum.find(
+              companyTypeEnum.find(
                 (item) => item.value === oilCompanyMatch[3].accountState
               ).label
             }}
@@ -545,6 +546,10 @@ export default {
         },
       ],
       auditMarkEnum: [
+        {
+          value: null,
+          label: "",
+        },
         {
           label: "未提交",
           value: "0",
@@ -567,6 +572,10 @@ export default {
         },
       ],
       companyNatureTypeEnum: [
+        {
+          value: null,
+          label: "",
+        },
         {
           label: "零售客户",
           value: "0",

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 titleConfirm = ['是否确认订单已完成？','一旦确认，该订单无法再被提货，且未提货的金额将自行退回。']
-        let data={
+      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/product/components/adjust.vue

@@ -47,7 +47,7 @@ export default {
     };
     let validatorSalePrice2company = (rule, value, callback) => {
       if (!value || !+value) return callback("企业销售价不能为0或空");
-      if (value < this.form.floorPrice)
+      if (+value < this.form.floorPrice)
         return callback("企业销售价不能低于成本价");
       callback();
     };

src/views/product/components/create.vue

@@ -112,14 +112,14 @@ export default {
     "form.salePrice": {
       handler(n, o) {
         if(n){
-          this.form.preAmount = this.form.salePrice*(this.form.preQuantity?this.form.preQuantity:0)
+          this.form.preAmount = (this.form.salePrice*(this.form.preQuantity?this.form.preQuantity:0)).toFixed(2)
         }
       },
     },
     "form.preQuantity": {
       handler(n, o) {
         if(n){
-          this.form.preAmount = this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)
+          this.form.preAmount = (this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)).toFixed(2)
         }
       },
     }
@@ -193,7 +193,6 @@ export default {
       );
       this.form.salePrice = this.productRowData[0].salePrice2company
       this.form.floorPrice = this.productRowData[0].floorPrice
-      this.form.productMeasurement = this.productRowData[0].measurement
     },
     productChange(){
       this.productData()
@@ -256,7 +255,7 @@ export default {
     submit() {
       this.$refs["form"].validate((valid) => {
         if (valid) {
-
+          this.form.productMeasurement = this.productRowData[0].measurement
           this.judgeInterface(this.form).then((res) => {
             if (res.code === 20000) {
               this.$message.success(res.msg);

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"