Browse Source

修改 达沃特 2022-5-10 需求更改

caojunjie 3 years ago
parent
commit
b6d3dee17d

+ 16 - 1
src/router/views/index.js

@@ -469,11 +469,26 @@ export default [{
       name: '销售政策',
       meta: {
         i18n: 'maintenance/salesPolicy/index',
-        keepAlive: true,
+        keepAlive: true
       },
       component: () => import( /* webpackChunkName: "views" */ '@/views/maintenance/salesPolicy/index')
     }]
   },
+  //陆运委托
+  {
+    path: '/landTransportation/placeAnOrder/index',
+    component: Layout,
+    hidden: true,
+    children: [{
+      path: '/landTransportation/placeAnOrder/index',
+      name: '委托',
+      meta: {
+        i18n: '/landTransportation/placeAnOrder/index',
+        keepAlive: true,
+      },
+      component: () => import( /* webpackChunkName: "views" */ '@/views/landTransportation/placeAnOrder/index')
+    }]
+  },
   //秒杀详情页
   {
     path: '/panicBuyingInformation_detailsPageEdit',

+ 3 - 0
src/views/businessManagement/purchaseOrder/detailsPageEdit.vue

@@ -20,6 +20,7 @@
           <el-button
             type="warning"
             size="small"
+            :loading="saveLoading"
           >
             账单处理<i class="el-icon-arrow-down el-icon--right"></i>
           </el-button>
@@ -44,6 +45,7 @@
         </el-dropdown>
         <el-button type="primary"
                    size="small"
+                   :loading="saveLoading"
                    :disabled="detailData.seeDisabled || !form.id"
                    @click="postMessage"
         >发送消息</el-button>
@@ -52,6 +54,7 @@
           class="el-button--small-yh"
           type="success"
           @click="copyOrder"
+          :loading="saveLoading"
           :disabled="detailData.seeDisabled || !this.form.id"
         >
           复制单据

+ 42 - 0
src/views/businessManagement/receipt/configuration/mainList.json

@@ -200,6 +200,48 @@
       "index": 17,
       "width": 100,
       "overHidden": true
+    },
+    {
+      "label": "状态",
+      "prop": "deliveryStatus",
+      "search": false,
+      "index": 18,
+      "width": 100,
+      "overHidden": true
+    },
+    {
+      "label": "物流确认",
+      "prop": "logisticsConfirm",
+      "search": false,
+      "index": 19,
+      "width": 100,
+      "dicData": [
+        {
+          "label": "否",
+          "value": 0
+        },{
+          "label": "是",
+          "value": 1
+        }
+      ],
+      "overHidden": true
+    },
+    {
+      "label": "助理确认",
+      "prop": "assistantConfirm",
+      "search": false,
+      "index": 20,
+      "width": 100,
+      "dicData": [
+        {
+          "label": "否",
+          "value": 0
+        },{
+          "label": "是",
+          "value": 1
+        }
+      ],
+      "overHidden": true
     }
   ]
 }

+ 7 - 3
src/views/businessManagement/receipt/detailsPageEdit.vue

@@ -17,6 +17,7 @@
         <el-button type="primary"
                    size="small"
                    :disabled="!form.id"
+                   :loading="saveLoading"
                    @click="postMessage"
         >发送消息</el-button>
         <el-button
@@ -25,6 +26,7 @@
           @click="revokeInGoods"
           size="small"
           v-if="form.deliveryStatus !== '录入'"
+          :loading="saveLoading"
           :disabled="detailData.seeDisabled"
         >撤销发货</el-button>
         <el-button
@@ -33,12 +35,14 @@
           @click="sendInGoods"
           size="small"
           v-if="form.deliveryStatus == '录入'"
+          :loading="saveLoading"
           :disabled="detailData.seeDisabled || !this.form.id"
         >确认发货</el-button>
         <el-button
           class="el-button--small-yh"
           size="small"
           type="success" @click="copyOrder"
+          :loading="saveLoading"
           :disabled="detailData.seeDisabled || !this.form.id">
           复制单据
         </el-button>
@@ -1052,8 +1056,8 @@ export default {
       this.treeData = [];
     },
     logisticsConfirmChange(row){
-          if(row==1){
-        this.$set(this.form, 'logisticsConfirmUser',localStorage.getItem("roleName"))
+      if(row==1){
+        this.$set(this.form, 'logisticsConfirmUser',JSON.parse(localStorage.getItem("saber-userInfo")).content.real_name)
         this.$set(this.form, 'logisticsConfirmTime',dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss"))
       }else{
         this.$set(this.form, 'logisticsConfirmUser',null)
@@ -1062,7 +1066,7 @@ export default {
     },
     assistantConfirmChange(row){
        if(row==1){
-        this.$set(this.form, 'assistantConfirmUser',localStorage.getItem("roleName"))
+        this.$set(this.form, 'assistantConfirmUser',JSON.parse(localStorage.getItem("saber-userInfo")).content.real_name)
         this.$set(this.form, 'assistantConfirmTime',dateFormat(new Date(), "yyyy-MM-dd hh:mm:ss"))
       }else{
         this.$set(this.form, 'assistantConfirmUser',null)

+ 2 - 2
src/views/businessManagement/receipt/index.vue

@@ -143,8 +143,8 @@ export default {
   },
   async created() {
     this.search.businessDate = defaultDate(1)
-    this.option = option
-      // this.option = await this.getColumnData(this.getColumnName(23), option);
+    // this.option = option
+    this.option = await this.getColumnData(this.getColumnName(23), option);
     gainUser().then(res => {
       this.findObject(this.option.column, "createUser").dicData = res.data.data;
     })

+ 1 - 0
src/views/businessManagement/salesOrder/configuration/customerContact.json

@@ -7,6 +7,7 @@
   "searchShow": true,
   "addBtn":false,
   "editBtn":false,
+  "height": "auto",
   "delBtn": false,
   "addRowBtn":false,
   "cellBtn":false,

+ 58 - 67
src/views/maintenance/salesPolicy/detailsPageEdit.vue

@@ -334,7 +334,6 @@ import { getToken } from "@/util/auth";
 import { getPurchasePrice } from "@/api/basicData/fees"
 
 export default {
-  name: "detailsPage",
   props: {
     detailData: Object
   },
@@ -494,12 +493,12 @@ export default {
           const parentId = node.level === 0 ? 0 : node.data.id;
           getDeptLazyTree(parentId).then(res => {
             resolve(
-              res.data.data.map(item => {
-                return {
-                  ...item,
-                  leaf: !item.hasChildren
-                };
-              })
+                res.data.data.map(item => {
+                  return {
+                    ...item,
+                    leaf: !item.hasChildren
+                  };
+                })
             );
           });
         },
@@ -547,37 +546,29 @@ export default {
       this.contactsData = [];
     }
   },
-  watch: {
-    $route(to, from) {
-      if (this.detailData.id) {
-      } else {
-        this.form = {};
-      }
-    }
-  },
   methods: {
     queryData(id) {
       this.openFullScreen(false, "正在努力的加载...");
       detail(id)
-        .then(res => {
-          this.form = res.data.data;
-          if (this.form.corpNameList) {
-            this.configuration.dicData = this.form.corpNameList;
-          }
-          this.form.corps = this.form.corps.split(",");
-          // if (res.data.data.specialItemList) this.contactsData = res.data.data.specialItemList
-          if (res.data.data.presentItemList)
-            this.contactsDataBuyFree = res.data.data.presentItemList;
-          this.oldForm = Object.assign({}, this.form);
-          // this.oldSpecialOffer = this.deepClone(this.contactsData)
-          this.oldBuyFree = this.deepClone(this.contactsDataBuyFree);
-          delete this.form.specialItemList;
-          delete this.form.presentItemList;
-          this.getItemdetail();
-        })
-        .finally(() => {
-          this.openFullScreen(true);
-        });
+          .then(res => {
+            this.form = res.data.data;
+            if (this.form.corpNameList) {
+              this.configuration.dicData = this.form.corpNameList;
+            }
+            this.form.corps = this.form.corps.split(",");
+            // if (res.data.data.specialItemList) this.contactsData = res.data.data.specialItemList
+            if (res.data.data.presentItemList)
+              this.contactsDataBuyFree = res.data.data.presentItemList;
+            this.oldForm = Object.assign({}, this.form);
+            // this.oldSpecialOffer = this.deepClone(this.contactsData)
+            this.oldBuyFree = this.deepClone(this.contactsDataBuyFree);
+            delete this.form.specialItemList;
+            delete this.form.presentItemList;
+            this.getItemdetail();
+          })
+          .finally(() => {
+            this.openFullScreen(true);
+          });
     },
     getItemdetail() {
       this.contactLoading = true;
@@ -586,14 +577,14 @@ export default {
         size: this.contactPage.pageSize,
         pid: this.form.id
       })
-        .then(res => {
-          this.contactsData = res.data.data.records;
-          this.contactPage.total = res.data.data.total;
-          this.customerContact.height = window.innerHeight - 240;
-        })
-        .finally(() => {
-          this.contactLoading = false;
-        });
+          .then(res => {
+            this.contactsData = res.data.data.records;
+            this.contactPage.total = res.data.data.total;
+            this.customerContact.height = window.innerHeight - 240;
+          })
+          .finally(() => {
+            this.contactLoading = false;
+          });
     },
     currentChange(val) {
       this.contactPage.currentPage = val;
@@ -649,19 +640,19 @@ export default {
     onLoad(page, params = {}) {
       this.loading = true;
       getGoods(page.currentPage, page.pageSize, this.treeDeptId, params)
-        .then(res => {
-          const data = res.data.data;
-          this.page.total = data.total;
-          this.goodsList = data.records;
-          if (this.page.total) {
-            this.goodsOption.height = window.innerHeight - 400;
-          } else {
-            this.goodsOption.height = window.innerHeight - 400;
-          }
-        })
-        .finally(() => {
-          this.loading = false;
-        });
+          .then(res => {
+            const data = res.data.data;
+            this.page.total = data.total;
+            this.goodsList = data.records;
+            if (this.page.total) {
+              this.goodsOption.height = window.innerHeight - 400;
+            } else {
+              this.goodsOption.height = window.innerHeight - 400;
+            }
+          })
+          .finally(() => {
+            this.loading = false;
+          });
     },
     // 确认导入商品
     importGoods() {
@@ -919,19 +910,19 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       })
-        .then(() => {
-          window.open(
-            `/api/blade-mocha-item/salespolicy/export-sales-policy?${
-              this.website.tokenHeader
-            }=${getToken()}`
-          );
-        })
-        .catch(() => {
-          this.$message({
-            type: "info",
-            message: "已取消"
+          .then(() => {
+            window.open(
+                `/api/blade-mocha-item/salespolicy/export-sales-policy?${
+                    this.website.tokenHeader
+                }=${getToken()}`
+            );
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消"
+            });
           });
-        });
     },
     //文件上传时
     uploading(event, file, fileList) {

+ 1 - 1
src/views/wel/home/landTransportation/components/sales-trend.vue

@@ -149,7 +149,7 @@
         lock-scroll
         width="80%">
       <div id="container"></div>
-      <div class="input-card" style="right: 10.3%" v-if="this.lineArr.length>0">
+      <div class="input-card" style="right: 10.3%;bottom: 10.3%" v-if="this.lineArr.length>0">
         <h4>轨迹回放控制</h4>
         <div class="input-item">
           <input type="button" class="btn" value="开始动画" id="start" @click="startAnimation()"/>