xiugai

Reviewed-on: #7

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/order/index.vue

@@ -1,7 +1,12 @@
 <template>
   <div class="order">
     <div class="frame">
-      <el-input class="mr20" v-model="parameter.params.id" placeholder="订单编号" clearable></el-input>
+      <el-input
+        class="mr20"
+        v-model="parameter.params.id"
+        placeholder="订单编号"
+        clearable
+      ></el-input>
       <!-- 公司名称 -->
       <autocomplete
         class="mr20"
@@ -84,19 +89,30 @@
           </template>
         </el-table-column>
 
-        <el-table-column 
+        <el-table-column prop="salePrice" label="价格" minWidth="90">
-        prop="salePrice" label="价格" minWidth="90">
         </el-table-column>
 
-    
+        <el-table-column
-        <el-table-column prop="payStatus" label="支付状态" minWidth="120" show-overflow-tooltip>
+          prop="payStatus"
+          label="支付状态"
+          minWidth="120"
+          show-overflow-tooltip
+        >
           <template slot-scope="{ row }">
-            <el-tag :effect="payTagType(row.payStatus).effect" :type="payTagType(row.payStatus).type">{{ payTagType(row.payStatus).label }}</el-tag>
+            <el-tag
+              :effect="payTagType(row.payStatus).effect"
+              :type="payTagType(row.payStatus).type"
+              >{{ payTagType(row.payStatus).label }}</el-tag
+            >
           </template>
         </el-table-column>
         <el-table-column prop="orderStatus" label="订单状态" minWidth="120">
           <template slot-scope="{ row }">
-            <el-tag :effect="orderTagType(row.orderStatus).effect" :type="orderTagType(row.orderStatus).type">{{ orderTagType(row.orderStatus).label }}</el-tag>
+            <el-tag
+              :effect="orderTagType(row.orderStatus).effect"
+              :type="orderTagType(row.orderStatus).type"
+              >{{ orderTagType(row.orderStatus).label }}</el-tag
+            >
           </template>
         </el-table-column>
 
@@ -106,7 +122,11 @@
           minWidth="180"
         >
           <template slot-scope="{ row }">
-            <span>{{ row.actQuantity|toNumberFixed }} / {{ row.preQuantity|toNumberFixed }} {{row.productMeasurement}}</span>
+            <span
+              >{{ row.actQuantity | toNumberFixed }} /
+              {{ row.preQuantity | toNumberFixed }}
+              {{ row.productMeasurement }}</span
+            >
           </template>
         </el-table-column>
 
@@ -116,7 +136,10 @@
           minWidth="180"
         >
           <template slot-scope="{ row }">
-            <span>{{ row.actAmount|toNumberFixed}} / {{ row.preAmount|toNumberFixed }} 元</span>
+            <span
+              >{{ row.actAmount | toNumberFixed }} /
+              {{ row.preAmount | toNumberFixed }} 元</span
+            >
           </template>
         </el-table-column>
         <el-table-column label="时间" minWidth="235">
@@ -129,30 +152,71 @@
             </p>
           </template>
         </el-table-column>
-        <el-table-column prop="orderSerialNumber" fixed="right" label="操作" width="250">
+        <el-table-column
+          prop="orderSerialNumber"
+          fixed="right"
+          label="操作"
+          width="250"
+        >
           <template slot-scope="{ row }">
             <el-link type="primary" :underline="false" @click="detail(row)"
               >详情</el-link
             >
-            <el-link v-show="row.orderStatus!=='SUBMITED'&&row.orderStatus!=='ORDER_LOCKED'" 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
-              :title="row.orderStatus=='SUBMITED'?'是否确认订单锁定？':'是否确认下单？'"
+              :title="
+                row.orderStatus == 'SUBMITED'
+                  ? '是否确认订单锁定？'
+                  : '是否确认下单？'
+              "
               icon-color="red"
               @confirm="Locked(row)"
             >
-              <el-link v-show="row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'" slot="reference" type="primary" :underline="false"
+              <el-link
-                >{{row.orderStatus=='SUBMITED'?'订单锁定':'下单确认'}}</el-link
+                v-show="
+                  row.orderStatus == 'SUBMITED' ||
+                  row.orderStatus == 'ORDER_LOCKED'
+                "
+                slot="reference"
+                type="primary"
+                :underline="false"
+                >{{
+                  row.orderStatus == "SUBMITED" ? "订单锁定" : "下单确认"
+                }}</el-link
               >
             </el-popconfirm>
             <el-popconfirm
-              :title="row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'?'是否确认取消订单？':'是否确认退款？'"
+              :title="
+                row.orderStatus == 'SUBMITED' ||
+                row.orderStatus == 'ORDER_LOCKED'
+                  ? '是否确认取消订单？'
+                  : '是否确认退款？'
+              "
               icon-color="red"
               @confirm="orderCencle(row)"
             >
-              <el-link v-show="row.orderStatus!=='CANCELED'&&row.payStatus!=='REFUNDED'" slot="reference" type="primary" :underline="false"
+              <el-link
-                >{{row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'?'订单取消':'订单退款'}}</el-link
+                v-show="
+                  row.orderStatus !== 'CANCELED' && row.payStatus !== 'REFUNDED'
+                "
+                slot="reference"
+                type="primary"
+                :underline="false"
+                >{{
+                  row.orderStatus == "SUBMITED" ||
+                  row.orderStatus == "ORDER_LOCKED"
+                    ? "订单取消"
+                    : "订单退款"
+                }}</el-link
               >
             </el-popconfirm>
           </template>
@@ -190,7 +254,11 @@
       </general-details>
     </el-drawer>
     <!-- 提货单 -->
-    <billOfLading :billData="billData" :controlWindows="controlWindows" @closeWindow="handleCurrentChange" />
+    <billOfLading
+      :billData="billData"
+      :controlWindows="controlWindows"
+      @closeWindow="handleCurrentChange"
+    />
   </div>
 </template>
 
@@ -207,17 +275,17 @@ export default {
   filters: {
     toNumberFixed(val) {
       if (val) {
-        return Number(val).toFixed(2)
+        return Number(val).toFixed(2);
-      }else{return '--'}
+      } else {
+        return "--";
       }
     },
+  },
   data() {
     return {
       controlWindows: {
         add: false,
-        addInfo: {
+        addInfo: {},
-
-        },
         detail: false,
         bill: false,
       },
@@ -231,7 +299,7 @@ export default {
       },
       configAutocompleteLc: {
         serveTarget: serve.findByEntity,
-        autocompleteKey: "name",
+        autocompleteKey: "refineryName",
         labelKey: "refineryName",
         valueKey: "id",
         placeholder: "炼厂名称",
@@ -285,7 +353,7 @@ export default {
     generalDetails,
     billOfLading,
     autocomplete,
-    productApi
+    productApi,
   },
   mounted() {
     this.$nextTick(() => {
@@ -303,27 +371,41 @@ export default {
   methods: {
     payTagType(val) {
       switch (val) {
-        case 'PREPAID': return {label:'预支付',type:'info'}
+        case "PREPAID":
-        case 'PAYING': return {label:'支付中',type:'warning'}
+          return { label: "预支付", type: "info" };
-        case 'SUCCESS': return {label:'支付成功',type:'success',effect:'dark'}
+        case "PAYING":
-        case 'FAILURE': return {label:'支付失败',type:'danger',effect:'dark'}
+          return { label: "支付中", type: "warning" };
-        case 'CANCELED': return {label:'支付取消',type:'info'}
+        case "SUCCESS":
-        case 'REFUNDED': return {label:'退款成功',type:'danger',effect:'dark'}
+          return { label: "支付成功", type: "success", effect: "dark" };
-        case 'REFUNDING': return{label:'退款中',type:'warning'}
+        case "FAILURE":
-        case 'REFUNDFAIL': return{label:'退款失败',type:'info',effect:'dark'}
+          return { label: "支付失败", type: "danger", effect: "dark" };
+        case "CANCELED":
+          return { label: "支付取消", type: "info" };
+        case "REFUNDED":
+          return { label: "退款成功", type: "danger", effect: "dark" };
+        case "REFUNDING":
+          return { label: "退款中", type: "warning" };
+        case "REFUNDFAIL":
+          return { label: "退款失败", type: "info", effect: "dark" };
       }
-      return {label:val?val:'暂无数据',type:'info',effect:'plain'}
+      return { label: val ? val : "暂无数据", type: "info", effect: "plain" };
     },
     orderTagType(val) {
       switch (val) {
-        case 'SUBMITED': return {label:'订单提交 ',type:'info'}
+        case "SUBMITED":
-        case 'ORDER_LOCKED': return {label:'订单锁定',type:'warning'}
+          return { label: "订单提交 ", type: "info" };
-        case 'ORDER_SUCCESS': return {label:'下单成功',type:'success',effect:'dark'}
+        case "ORDER_LOCKED":
-        case 'DELIVERING': return {label:'提货中', type: ''}
+          return { label: "订单锁定", type: "warning" };
-        case 'COMPLETE': return {label:'订单完成',type:'success',effect:'dark'}
+        case "ORDER_SUCCESS":
-        case 'CANCELED': return {label:'订单取消',type:'info'}
+          return { label: "下单成功", type: "success", effect: "dark" };
+        case "DELIVERING":
+          return { label: "提货中", type: "" };
+        case "COMPLETE":
+          return { label: "订单完成", type: "success", effect: "dark" };
+        case "CANCELED":
+          return { label: "订单取消", type: "info" };
       }
-      return {label:val?val:'暂无数据',type:'info'}
+      return { label: val ? val : "暂无数据", type: "info" };
     },
     // currentPage change
     handleCurrentChange(page) {
@@ -351,16 +433,18 @@ export default {
     },
     //下单取消
     orderCencle(row) {
-      if(row.orderStatus=='SUBMITED'||row.orderStatus=='ORDER_LOCKED'){
+      if (row.orderStatus == "SUBMITED" || row.orderStatus == "ORDER_LOCKED") {
-        order.orderUpdate({id:row.id,orderStatus:'CANCELED'}).then((res) => {
+        order
+          .orderUpdate({ id: row.id, orderStatus: "CANCELED" })
+          .then((res) => {
             if (res.code == 20000) {
-            this.getByPage()
+              this.getByPage();
             }
           });
       } else {
         order.orderRefund({ id: row.id }).then((res) => {
           if (res.code == 20000) {
-            this.getByPage()
+            this.getByPage();
           }
         });
       }
@@ -374,13 +458,13 @@ export default {
     async billOfLading(row) {
       this.controlWindows.addInfo.title = "";
       await order.findDeliveryByOrderId(row.id).then((res) => {
-        this.billData.list = res.data
+        this.billData.list = res.data;
       });
       await order.findByOrderId(row.id).then((res) => {
-        this.billData.orderInfo = res.data
+        this.billData.orderInfo = res.data;
       });
-      this.controlWindows.addInfo = row
+      this.controlWindows.addInfo = row;
-      this.controlWindows.bill = true
+      this.controlWindows.bill = true;
     },
     //详情
     detail(row) {
@@ -389,16 +473,16 @@ export default {
     },
     //订单锁定
     Locked(row) {
-      if(row.orderStatus=='SUBMITED'){
+      if (row.orderStatus == "SUBMITED") {
         order.orderLock({ id: row.id }).then((res) => {
           if (res.code == 20000) {
-            this.getByPage()
+            this.getByPage();
           }
         });
       } else {
         order.orderSuccess({ id: row.id }).then((res) => {
           if (res.code == 20000) {
-            this.getByPage()
+            this.getByPage();
           }
         });
       }

src/views/product/components/add.vue

@@ -72,10 +72,14 @@
           </el-form-item>
         </template>
         <el-form-item label="计量单位" prop="measurement">
-          <el-input
+          <!-- <el-input
             v-model="form.measurement"
             placeholder="请输入计量单位"
-          ></el-input>
+            disabled
+          ></el-input> -->
+          <el-radio-group v-model="form.measurement">
+            <el-radio :label="'吨'">吨</el-radio>
+          </el-radio-group>
         </el-form-item>
         <el-form-item label="启用状态" prop="enableMark">
           <el-radio-group v-model="form.enableMark">
@@ -110,7 +114,9 @@ export default {
       else callback("请选择炼厂");
     };
     return {
-      form: {},
+      form: {
+        measurement:'吨'
+      },
       refineryList: [],
       configAutocomplete: {
         serveTarget: refineryInfoServe.findByEntity,
@@ -128,19 +134,19 @@ export default {
       productTypeList: [
         {
           label: "0#柴",
-          value: "0#",
+          value: "0#柴",
         },
         {
           label: "-10#柴",
-          value: "-10#",
+          value: "-10#柴",
         },
         {
           label: "92#汽",
-          value: "92#",
+          value: "92#汽",
         },
         {
           label: "95#汽",
-          value: "95#",
+          value: "95#汽",
         },
       ],
       rules: {
@@ -205,6 +211,7 @@ export default {
     closeWindow() {
       this.$emit("closeWindow");
       this.form = {};
+      this.form.measurement = '吨'
       this.controlWindows.addInfo = {};
       this.$nextTick(() => {
         this.$refs.autocomplete.list = [];

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/index.vue

@@ -277,7 +277,7 @@ export default {
       ],
       configAutocomplete: {
         serveTarget: serve.findByEntity,
-        autocomplateKey: "refineryName",
+        autocompleteKey: "refineryName",
         valueKey: "refineryName",
         valueKey: "id",
         placeholder: "炼厂名称",