Merge pull request 'lixuan' (#4) from lixuan into master

Reviewed-on: #4

src/components/autocomplete/index.vue

@@ -30,7 +30,7 @@
     <template>
       <el-option
         v-for="(item, index) in list"
-        :key="index"
+        :key="item.id + index"
         :label="item[config.labelKey]"
         :value="item[config.valueKey]"
       >
@@ -66,8 +66,7 @@ export default {
       handler(nval, oval) {
         this.list = [];
         // this.isDisabled = !!this.config.isDisabled;
-        let type = this.$utils.typeJudgment(this.config.echoName);
+        if (nval) {
-        if (nval && ["String"].includes(type)) {
           let resultName = this.config.echoName.replace(/\s*/g, "");
           if (!resultName) return;
           this.remoteMethod(resultName);

src/views/customerManagement/companyManagement/components/bank.vue

@@ -85,15 +85,13 @@
             <el-link type="primary" :underline="false" @click="complete(row)"
               >完成
             </el-link>
-            <el-popconfirm
+            <el-link
+              type="primary"
+              :underline="false"
               v-if="tableData.length > 1"
-              title="确定删除吗？"
+              @click="deleteRow($index, row)"
-              @confirm="deleteRow($index, row)"
+              >删除
-            >
+            </el-link>
-              <el-link slot="reference" type="primary" :underline="false"
-                >删除
-              </el-link>
-            </el-popconfirm>
           </template>
         </el-table-column>
       </el-table>

src/views/customerManagement/companyManagement/index.vue

@@ -56,18 +56,18 @@
           />
         </el-select>
 
-        <!-- <el-select
+        <el-select
           v-model="parameter.params.companyType"
           placeholder="账户类型"
           clearable
         >
           <el-option
-            v-for="(item, index) in companyTypeEnum"
+            v-for="(item, index) in companyNatureTypeEnum"
             :key="index"
             :label="item.label"
             :value="item.value"
           />
-        </el-select> -->
+        </el-select>
 
         <!-- 企业负责人或联系方式 -->
         <autocomplete
@@ -332,13 +332,13 @@
           </p>
         </template>
         <template #companyNature>
-          <p v-if="oilCompanyMatch[0]">
+          <!-- <p v-if="oilCompanyMatch[0]">
             {{
               companyNatureEnum.find(
                 (item) => item.value === oilCompanyMatch[0].companyNature
               ).label
             }}
-          </p>
+          </p> -->
         </template>
         <template #companyDockType>
           <p>
@@ -501,8 +501,7 @@ export default {
         querykey: "companyName",
       },
       configAutocompleteHead: {
-        serveTarget: commonServe.getRefineryCompanyList,
+        serveTarget: commonServe.getCompanyNames,
-        autocompleteKey: "name",
         labelKey: "name",
         valueKey: "name",
         placeholder: "总公司名称",
@@ -522,28 +521,6 @@ export default {
         total: 0,
         params: {},
       },
-      companyTypeEnum: [
-        {
-          label: "柴油账户",
-          value: "0",
-        },
-        {
-          label: "汽油账户",
-          value: "1",
-        },
-        {
-          label: "LNG账户",
-          value: "2",
-        },
-        {
-          label: "尿素账户",
-          value: "3",
-        },
-        {
-          label: "油批账户",
-          value: "4",
-        },
-      ],
       auditMarkEnum: [
         {
           label: "未提交",
@@ -694,7 +671,6 @@ export default {
       this.getByPage();
     },
     getByPage() {
-      this.parameter.params.companyType = "4";
       serve.getByPage(this.parameter).then((res) => {
         this.tableData = res.data.list;
         this.parameter.total = res.data.totalCount;

src/views/financialCenter/enterpriseRecharge/index.vue

@@ -355,7 +355,13 @@ export default {
         examine: false,
       },
       accountStatusEnum: accountStatusEnum,
-      rechargeTypeEnum: rechargeTypeEnum,
+      rechargeTypeEnum: [
+        {
+          label: "圈回",
+          value: "TURN",
+        },
+        ...rechargeTypeEnum,
+      ],
       rechargeStatusEnum: rechargeStatusEnum,
       auditMarkEnum: [
         {

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

@@ -36,11 +36,7 @@
             placeholder="请选择炼厂"
           ></el-autocomplete> -->
 
-          <autocomplete
+          <autocomplete :params="form" :config="configAutocomplete" />
-            ref="autocomplete"
-            :params="form"
-            :config="configAutocomplete"
-          />
         </el-form-item>
         <el-form-item label="所属炼厂库名" prop="belongLibrary">
           <el-input
@@ -207,7 +203,6 @@ export default {
       this.form = {};
       this.controlWindows.addInfo = {};
       this.$nextTick(() => {
-        this.$refs.autocomplete.list = [];
         this.$refs.form.clearValidate();
         this.controlWindows.add = false;
       });

src/views/product/components/adjust.vue

@@ -41,28 +41,14 @@ export default {
     controlWindows: Object,
   },
   data() {
-    let validatorFloorPrice = (rule, value, callback) => {
-      if (!value || !+value) return callback("成本价价不能为0或空");
-      callback();
-    };
-    let validatorSalePrice2company = (rule, value, callback) => {
-      if (!value || !+value) return callback("企业销售价不能为0或空");
-      if (value < this.form.floorPrice)
-        return callback("企业销售价不能低于成本价");
-      callback();
-    };
     return {
       form: {},
       rules: {
         floorPrice: [
-          { required: true, validator: validatorFloorPrice, trigger: "change" },
+          { required: true, message: "请输入成本价", trigger: "blur" },
         ],
         salePrice2company: [
-          {
+          { required: true, message: "请输入企业销售价", trigger: "blur" },
-            required: true,
-            validator: validatorSalePrice2company,
-            trigger: "change",
-          },
         ],
       },
     };

src/views/product/components/record.vue

@@ -66,7 +66,7 @@
               </p></template
             >
           </el-table-column>
-          <!-- <el-table-column label="个人销售价">
+          <el-table-column label="个人销售价">
             <template slot-scope="{ row }">
               <p v-if="row.salePrice2personal">
                 {{ row.salePrice2personal }}/{{ row.measurement }}
@@ -79,7 +79,7 @@
                 {{ row.lastSalePrice2personal }}/{{ row.measurement }}
               </p></template
             >
-          </el-table-column> -->
+          </el-table-column>
           <el-table-column label="时间" width="235">
             <template slot-scope="{ row }">
               <p class="gray">

src/views/product/index.vue

@@ -97,19 +97,19 @@
             </el-switch>
           </template>
         </el-table-column>
-        <el-table-column prop="refineryLevel" label="成本价" width="110">
+        <el-table-column prop="refineryLevel" label="成本价" width="70">
           <template slot-scope="{ row }">
-            {{ row.floorPrice | toNumberFixed }}/{{ row.measurement }}
+            {{ row.floorPrice|toNumberFixed }}/{{ row.measurement|toNumberFixed }}
           </template>
         </el-table-column>
-        <el-table-column prop="refineryLevel" label="企业销售价" width="110">
+        <el-table-column prop="refineryLevel" label="企业销售价" width="100">
           <template slot-scope="{ row }">
-            {{ row.salePrice2company | toNumberFixed }}/{{ row.measurement }}
+            {{ row.salePrice2company|toNumberFixed }}/{{ row.measurement|toNumberFixed }}
           </template>
         </el-table-column>
-        <el-table-column prop="refineryLevel" label="个人销售价" width="110">
+        <el-table-column prop="refineryLevel" label="个人销售价" width="100">
           <template slot-scope="{ row }">
-            {{ row.salePrice2personal | toNumberFixed }}/{{ row.measurement }}
+            {{ row.salePrice2personal|toNumberFixed }}/{{ row.measurement|toNumberFixed }}
           </template>
         </el-table-column>
         <el-table-column label="时间" width="235">
@@ -142,12 +142,7 @@
                 <el-dropdown-item command="record">调价记录</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
-            <span
+            <span v-show="row.enableMark=='ENABLE'" class="el-dropdown-link" @click="updateCreate(row)">下单</span>
-              v-show="row.enableMark == 'ENABLE'"
-              class="el-dropdown-link"
-              @click="updateCreate(row)"
-              >下单</span
-            >
             <el-dropdown
               @command="
                 (val) => {
@@ -237,14 +232,12 @@ export default {
     autocomplete,
     generalDetails,
   },
-  filters: {
+  filters:{
-    toNumberFixed(val) {
+    toNumberFixed(val){
-      if (val) {
+      if(val){
-        return Number(val).toFixed(2);
+        return Number(val).toFixed(2)
-      } else {
+      }else{return '暂无'}
-        return "暂无";
+    }
-      }
-    },
   },
   data() {
     return {
@@ -354,19 +347,19 @@ export default {
 
     //下单
     createOrder(row) {
-      this.controlWindows.addInfo = {};
+      this.controlWindows.addInfo = {}
       this.controlWindows.addInfo.title = "创建订单";
       this.controlWindows.create = true;
-      console.log(this.controlWindows, "新增");
+      console.log(this.controlWindows,'新增')
     },
     //修改订单
-    updateCreate(row) {
+    updateCreate(row){
       this.controlWindows.addInfo = {
-        title: "创建订单",
+          title: "创建订单",
-        ...row,
+          ...row,
-      };
+        };
-      this.controlWindows.create = true;
+        this.controlWindows.create = true;
-      console.log("修改");
+        console.log('修改')
     },
     //详情
     detail(row) {
@@ -397,32 +390,17 @@ export default {
     },
     //启用禁用
     switchTrigger(val, row) {
-      row.enableMark = val === "ENABLE" ? "DISENABLE" : "ENABLE";
+      row.enableMark = row.enableMark;
-      // return;
       serve
-        .updateBatchEnable([
+        .update({
-          {
+          id: row.id,
-            id: row.id,
+          enableMark: val,
-            enableMark: val,
+        })
-          },
-        ])
         .then((res) => {
           if (res.code === 20000) {
             this.getByPage();
-          }
+          } else this.$message.error(res.msg);
-          // this.$message.success(res.msg);
-          // this.closeWindow();
         });
-      // serve
-      //   .update({
-      //     id: row.id,
-      //     enableMark: val,
-      //   })
-      //   .then((res) => {
-      //     if (res.code === 20000) {
-      //       this.getByPage();
-      //     } else this.$message.error(res.msg);
-      //   });
     },
     //批量启用禁用
     batchHandler() {

src/views/refineryAccount/components/add.vue

@@ -27,11 +27,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="炼厂名称" prop="refineryId">
-          <autocomplete
+          <autocomplete :params="form" :config="configAutocomplete" />
-            ref="autocomplete"
-            :params="form"
-            :config="configAutocomplete"
-          />
         </el-form-item>
       </el-form>
     </div>
@@ -108,7 +104,6 @@ export default {
       this.form = {};
       this.controlWindows.addInfo = {};
       this.$nextTick(() => {
-        this.$refs.autocomplete.list = [];
         this.$refs.form.clearValidate();
         this.controlWindows.add = false;
       });

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"