1

2023-03-17 16:02:58 +08:00
6 changed files with 131 additions and 121 deletions
--- a/.env.development
+++ b/.env.development
@@ -1,4 +1,4 @@
 ENV = 'development'

 VUE_APP_BASE_API = '/api'
-VUE_APP_ENV = 'development'
+VUE_APP_ENV = 'production'
--- a/src/components/generalDetails/index.vue
+++ b/src/components/generalDetails/index.vue
@@ -11,11 +11,7 @@
    <div class="generalDetails_card_container">
      <div v-for="(item, index) in dataPage" :key="index">
        <el-card class="generalDetails_card">
-          <div
-            @click="isShow(item)"
-            class="generalDetails_card_header"
-            slot="header"
-          >
+          <div @click="isShow(item)" class="generalDetails_card_header" slot="header">
            <div>
              <span class="generalDetails-card-header-icon">
                <svg-icon style="color: #118dde" :icon-class="item.iconClass" />
@@ -25,30 +21,18 @@
              }}</span>
            </div>
            <div class="fold">
-              <i
-                :style="{
-                  transform: `rotate(${item.isFold ? 0 : 180}deg)`,
-                }"
-                class="el-icon-arrow-down generalDetails_card_arrow_down"
-              ></i>
+              <i :style="{
+                transform: `rotate(${item.isFold ? 0 : 180}deg)`,
+              }" class="el-icon-arrow-down generalDetails_card_arrow_down"></i>
            </div>
          </div>
-          <div
-            :style="{ maxHeight: item.isFold ? '100vh' : '0px' }"
-            class="my-cell"
-          >
-            <template
-              v-if="item.listData.length && item.listData[0].field !== 'table'"
-            >
+          <div :style="{ maxHeight: item.isFold ? '100vh' : '0px' }" class="my-cell">
+            <template v-if="item.listData.length && item.listData[0].field !== 'table'">
              <div v-for="(i, x) in item.listData" :key="x" class="cell-item">
                <span :title="i.remark" class="color-999 test-tst">
                  {{ i.label }}
                  <i v-if="i.remark" class="header-icon el-icon-info"></i>
-                  <i
-                    @click="isCopy($event)"
-                    v-if="i.isCopy"
-                    class="el-icon-document-copy"
-                  ></i>
+                  <i @click="isCopy($event)" v-if="i.isCopy" class="el-icon-document-copy"></i>
                </span>
                <br />
                <slot class="inner-data" :name="`${i.field}`">
@@ -126,7 +110,7 @@ export default {
              let value =
                (typeof carItem.value == "function" &&
                  carItem.value(shineData)) ||
-                shineData[carItem.value] == 0
+                  shineData[carItem.value] == 0
                  ? 0
                  : shineData[carItem.value] || carItem.fieldDefault || "";
              return {
@@ -172,6 +156,7 @@ export default {
 .title_bottom {
  margin-top: 20px;
 }
+
 .fold {
  display: flex;
  justify-content: flex-end;
--- a/src/views/order/components/billOfLading.vue
+++ b/src/views/order/components/billOfLading.vue
@@ -227,10 +227,13 @@ export default {
          this.billListMeth()
          // this.$set(this.billData.list,this.billData.index,this.billAddData)
          this.$message.success(res.msg)
-          this.dialogDelivery = false
+          this.dialogDelivery = false;
+          console.log('更新前',this.billData)
+          this.$emit('billOfLading', this.billData, 2);
+          this.$forceUpdate()
+
        }
      });
-      this.$emit('billOfLading', this.billData, 2)
    },
    billSubmit(e, index) {
      if (e.deliveryStatus == 'PLATENUM_SUCCESS') {
@@ -275,39 +278,41 @@ export default {
      this.dialogBillAdd = true
    },
    //创建修改提货单
-    billAddSave(e, item) {
+    async billAddSave(e, item) {
      if (!e) {
-        this.$refs["form"].validate((valid) => {
+        this.$refs["form"].validate( async (valid) => {
          if (valid) {
            this.billAddData.orderId = this.controlWindows.addInfo.id
            this.billAddData.productMeasurement = this.controlWindows.addInfo.productMeasurement
-            order.billSave(this.billAddData).then(res => {
+           await 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;
+      this.$emit('billOfLading', this.billData.orderInfo, 2)
              }
            })
          }
        })
-      } else  {
-        this.$confirm(`确定${e==1?'修改':'锁定'}提货单?`, '提示', { type: 'error' }).then(() => {
+      } else {
+        this.$confirm(`确定${e == 1 ? '修改' : '锁定'}提货单?`, '提示', { type: 'error' }).then( async () => {
          // this.billAddData = item ? JSON.parse(JSON.stringify(item)) : {};
          this.billAddData.deliveryStatus = e == 2 ? 'PLATENUM_LOCKED' : '';
-          console.log(this.billAddData,'this.billAddData')
-          order.update(this.billAddData).then(res => {
+          console.log(this.billAddData, 'this.billAddData')
+         await order.update(this.billAddData).then(res => {
            if (res.code == 20000) {
              this.billListMeth()
              this.$message.success(res.msg)
              this.dialogBillAdd = false;
-
+      this.$emit('billOfLading', this.billData.orderInfo, 2)
            }
          })
        })
-      }
-      this.$emit('billOfLading', this.billData.orderInfo, 2)
+      };
+      console.log('代码底部');
+      
    },
    //更新提货单数据
    billListMeth() {
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -363,6 +363,7 @@ export default {
      }
      if(!selectIndex||selectIndex==2){
        await order.findByOrderId(row.id).then((res) => {
+          console.log('更新',res)
        this.billData.orderInfo = Object.assign(res.data,{id:row.id})
      });
      }
--- a/src/views/product/components/create.vue
+++ b/src/views/product/components/create.vue
@@ -10,14 +10,7 @@
    <div class="create" v-if="controlWindows.create">
      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
        <el-form-item label="客户名称" prop="customerId">
-          <el-select
-            v-model="form.customerId"
-            reserve-keyword
-            remote
-            :remote-method="customData"
-            filterable
-            placeholder="请选择客户"
-          >
+          <el-select v-model="form.customerId" reserve-keyword remote :remote-method="customData" filterable placeholder="请选择客户">
            <el-option
              v-for="(item, index) in customList"
              :key="index"
@@ -39,26 +32,17 @@
          <autocomplete :params="form" :config="configAutocomplete" />
        </el-form-item>
        <el-form-item label="产品类型" prop="productType">
-          <el-select
-            v-model="form.productType"
-            @change="productChange"
-            placeholder="请选择产品类型"
-          >
+          <el-select v-model="form.productType" @change="productChange" placeholder="请选择产品类型">
            <el-option
              v-for="(item, index) in productTypeList"
              :key="index"
-              :label="item"
-              :value="item"
+              :label="item.label"
+              :value="item.value"
            ></el-option>
          </el-select>
        </el-form-item>
        <el-form-item label="产品名称" prop="productId">
-          <el-select
-            :disabled="rowCreate"
-            v-model="form.productId"
-            @change="productDataList"
-            placeholder="请选择产品类型"
-          >
+          <el-select :disabled="rowCreate" v-model="form.productId" @change="productDataList" placeholder="请选择产品类型">
            <el-option
              v-for="(item, index) in productNameList"
              :key="index"
@@ -90,7 +74,11 @@
          吨
        </el-form-item>
        <el-form-item label="订单金额">
-          <el-input maxlength="50" v-model="form.preAmount" disabled></el-input>
+          <el-input
+            maxlength="50"
+            v-model="form.preAmount"
+            disabled
+          ></el-input>
          元
        </el-form-item>
      </el-form>
@@ -115,27 +103,21 @@ export default {
    controlWindows: Object,
    // refineryTypeEnum: Array,
  },
-  watch: {
+  watch:{
    "form.salePrice": {
      handler(n, o) {
-        if (n) {
-          this.form.preAmount = (
-            this.form.salePrice *
-            (this.form.preQuantity ? this.form.preQuantity : 0)
-          ).toFixed(2);
+        if(n){
+          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)
-          ).toFixed(2);
+        if(n){
+          this.form.preAmount = (this.form.preQuantity*(this.form.salePrice?this.form.salePrice:0)).toFixed(2)
        }
      },
-    },
+    }
  },
  data() {
    let validatorRefineryId = (rule, value, callback) => {
@@ -143,18 +125,18 @@ export default {
      else callback("请选择炼厂");
    };
    return {
-      rowCreate: false,
-      customList: [],
+      rowCreate:false,
+      customList:[],
      form: {
-        preAmount: 0,
+        preAmount:0
      },
-      productNameList: [],
+      productNameList:[],
      refineryList: [],
-      productRowData: {},
+      productRowData:{},
      configAutocomplete: {
        serveTarget: serve.findByEntity,
        autocompleteKey: {
-          key: "refineryName",
+          key:"refineryName"
        },
        labelKey: "refineryName",
        valueKey: "id",
@@ -163,7 +145,24 @@ export default {
        echoId: "",
        echoName: "",
      },
-      productTypeList: ["0#柴", "-10#柴", "92#汽", "95#汽"],
+      productTypeList: [
+        {
+          label: "0#柴",
+          value: "0#",
+        },
+        {
+          label: "-10#柴",
+          value: "-10#",
+        },
+        {
+          label: "92#汽",
+          value: "92#",
+        },
+        {
+          label: "95#汽",
+          value: "95#",
+        },
+      ],
      rules: {
        customerId: [
          { required: true, message: "请输入客户名称", trigger: "blur" },
@@ -184,74 +183,77 @@ export default {
    };
  },
  methods: {
-    productDataList(e) {
-      this.productRowData = this.productNameList.filter((item) => item.id == e);
-      this.form.salePrice = this.productRowData[0].salePrice2company;
-      this.form.floorPrice = this.productRowData[0].floorPrice;
-      this.form.productMeasurement = this.productRowData[0].measurement;
+    productDataList(e){
+      this.productRowData = this.productNameList.filter(
+        (item) => item.id == e
+      );
+      this.form.salePrice = this.productRowData[0].salePrice2company
+      this.form.floorPrice = this.productRowData[0].floorPrice
+      this.form.productMeasurement = this.productRowData[0].measurement
    },
-    productChange() {
-      this.productData();
+    productChange(){
+      this.productData()
    },
    //搜索炼厂
-    refineryData(value) {
+    refineryData(value){
      if (value) {
-        serve.findByEntity({ refineryName: value }).then((res) => {
+        serve.findByEntity({refineryName:value}).then((res) => {
          this.refineryList = res.data;
        });
-        this.productData();
+        this.productData()
      }
    },
    //搜索产品
-    productData() {
+    productData(){
      let data = {
-        refineryId: this.form.refineryId,
-        productType: this.form.productType,
-        enableMark: "ENABLE",
-      };
+        refineryId:this.form.refineryId,
+        productType:this.form.productType,
+        enableMark:'ENABLE'
+      }
      serve.getRefineryProductList(data).then((res) => {
-        if (res.data.length > 0) {
+       if(res.data.length>0){
          this.productNameList = res.data;
-        } else {
-          this.productNameList = [];
-          this.form.productId = "";
+        }else{
+          this.productNameList = []
+          this.form.productId = ''
        }
-      });
-      console.log(this.productRowData, "aaaaaaaaaa");
+      })
+        console.log(this.productRowData,'aaaaaaaaaa')
    },
    //搜索客户
-    customData(value) {
+    customData(value){
      if (value) {
-        serve.getRefineryCompanyList({ name: value }).then((res) => {
+        serve.getRefineryCompanyList({name:value}).then((res) => {
          this.customList = res.data;
-          this.form.customerId = this.$store.state.user.companyId;
-          console.log(this.form.customerId, "ssssaaaaaaaaaaaaaaa");
+          this.form.customerId = this.$store.state.user.companyId
+          console.log(this.form.customerId,'ssssaaaaaaaaaaaaaaa')
        });
      }
    },
    openDrawer() {
-      this.form = {};
+      this.form = {}
      let { id } = this.controlWindows.addInfo;
      if (id) {
        //回显
        this.form = JSON.parse(JSON.stringify(this.controlWindows.addInfo));
        this.configAutocomplete.echoId = id;
        this.configAutocomplete.echoName = this.form.refineryName;
-        this.form.salePrice = this.form.salePrice2company;
-        this.form.productId = this.form.id;
-        delete this.form.id;
-        this.rowCreate = true;
-        this.productChange();
-        this.customData(this.$store.state.user.userCompanyName);
+        this.form.salePrice = this.form.salePrice2company
+        this.form.productId = this.form.id
+        delete this.form.id
+        this.rowCreate = true
+        this.productChange()
+        this.customData(this.$store.state.user.userCompanyName)
        
-        console.log("this.form", this.$store.state.user, this.form);
-      } else {
-        this.rowCreate = false;
+        console.log("this.form", this.$store.state.user,this.form);
+      }else{
+        this.rowCreate = false
      }
    },
    submit() {
      this.$refs["form"].validate((valid) => {
        if (valid) {
+
          this.judgeInterface(this.form).then((res) => {
            if (res.code === 20000) {
              this.$message.success(res.msg);
--- a/src/views/product/index.vue
+++ b/src/views/product/index.vue
@@ -28,8 +28,8 @@
        <el-option
          v-for="(item, index) in productTypeList"
          :key="index"
-          :label="item"
-          :value="item"
+          :label="item.label"
+          :value="item.value"
        >
        </el-option>
      </el-select>
@@ -164,7 +164,24 @@ export default {
        detail: false,
        create: false,
      },
-      productTypeList: ["0#柴", "-10#柴", "92#汽", "95#汽"],
+      productTypeList: [
+        {
+          label: "0#柴",
+          value: "0#",
+        },
+        {
+          label: "-10#柴",
+          value: "-10#",
+        },
+        {
+          label: "92#汽",
+          value: "92#",
+        },
+        {
+          label: "95#汽",
+          value: "95#",
+        },
+      ],
      configAutocomplete: {
        serveTarget: serve.findByEntity,
        autocompleteKey: "refineryName",
@@ -221,8 +238,8 @@ export default {
    },
    //table list
    getByPage() {
-      this.parameter.params["enableMark"] = "ENABLE";
-      serve.getByPage(this.parameter).then((res) => {
+      let data = Object.assign(this.parameter,{enableMark: 'ENABLE'});
+      serve.getByPage(data).then((res) => {
        this.tableData = res.data.list;
        this.parameter.total = res.data.totalCount;
      });