配件商城和达沃特

src/views/basicData/container/archives.vue

@@ -45,6 +45,9 @@
       <template slot-scope="{type,size,row,index,disabled}" slot="code">
         <span class="el-button--text" style="cursor: pointer" @click="track(row)">{{row.code}}</span>
       </template>
+      <template slot-scope="{ row }" slot="status">
+        <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+      </template>
       <template slot="leasingCompanyIdForm">
         <crop-select v-model="form.leasingCompanyId" disabled @getCorpData="getGSData" corpType="KH"/>
       </template>

src/views/boxManagement/boxRepair/index.vue

@@ -16,6 +16,9 @@
           @resetColumn="resetColumnTwo('crud','option','optionList',242)"
           @saveColumn="saveColumnTwo('crud','option','optionList',242)"
           :page.sync="page">
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+        </template>
         <template slot="addressSearch">
           <port-info v-model="search.addressId" type="id"/>
         </template>

src/views/boxManagement/boxWashing/index.vue

@@ -16,6 +16,9 @@
           @resetColumn="resetColumnTwo('crud','option','optionList',243)"
           @saveColumn="saveColumnTwo('crud','option','optionList',243)"
           :page.sync="page">
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+        </template>
         <template slot="addressSearch">
           <port-info v-model="search.addressId" type="id"/>
         </template>

src/views/boxManagement/buyContainer/index.vue

@@ -22,6 +22,9 @@
         <template slot="purchaseCompanyId" slot-scope="{row}">
           {{ row.purchaseCompanyName }}
         </template>
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+        </template>
         <template slot-scope="{type,size,row,$index}" slot="menu">
           <el-button icon="el-icon-view" :size="size" :type="type" @click="check(row)">查看</el-button>
           <el-button icon="el-icon-delete" :size="size" v-if="row.status == 0" :type="type" @click="$refs.crud.rowDel(row,$index)">删除

src/views/boxManagement/exportShipment/index.vue

@@ -16,6 +16,9 @@
           @resetColumn="resetColumnTwo('crud','option','optionList',237)"
           @saveColumn="saveColumnTwo('crud','option','optionList',237)"
           :page.sync="page">
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+        </template>
         <template slot="purchaseCompanyIdSearch">
           <crop-select v-model="search.purchaseCompanyId" corpType="GS"/>
         </template>

src/views/boxManagement/importReturnTrip/index.vue

@@ -16,6 +16,9 @@
           @resetColumn="resetColumnTwo('crud','option','optionList',237.9)"
           @saveColumn="saveColumnTwo('crud','option','optionList',237.9)"
           :page.sync="page">
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+        </template>
         <template slot="purchaseCompanyIdSearch">
           <crop-select v-model="search.purchaseCompanyId" corpType="GS"/>
         </template>

src/views/boxManagement/leaseIn/index.vue

@@ -16,6 +16,9 @@
           @resetColumn="resetColumnTwo('crud','option','optionList',245)"
           @saveColumn="saveColumnTwo('crud','option','optionList',245)"
           :page.sync="page">
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+        </template>
         <template slot="purchaseCompanyIdSearch">
           <crop-select v-model="search.purchaseCompanyId" corpType="GS"/>
         </template>

src/views/boxManagement/leaseOut/index.vue

@@ -16,6 +16,9 @@
           @resetColumn="resetColumnTwo('crud','option','optionList',247)"
           @saveColumn="saveColumnTwo('crud','option','optionList',247)"
           :page.sync="page">
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+        </template>
         <template slot="purchaseCompanyIdSearch">
           <crop-select v-model="search.purchaseCompanyId" corpType="GS"/>
         </template>

src/views/boxManagement/sellingContainers/index.vue

@@ -19,6 +19,9 @@
         <template slot="purchaseCompanyIdSearch">
           <crop-select v-model="search.purchaseCompanyId" corpType="GS"/>
         </template>
+        <template slot-scope="{ row }" slot="status">
+          <span v-for="item in $refs.crud.DIC.status" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>
+        </template>
         <template slot="purchaseCompanyId" slot-scope="{row}">
           {{ row.purchaseCompanyName }}
         </template>

src/views/businessManagement/purchaseOrder/configuration/mainList.json

@@ -20,7 +20,7 @@
   "searchIcon": true,
   "searchIndex": 2,
   "searchSpan": 8,
-  "searchMenuSpan": 16,
+  "searchMenuSpan": 24,
   "showSummary": true,
   "summaryText": "合计",
   "sumColumnList": [
@@ -89,7 +89,7 @@
     {
       "label": "采购金额",
       "prop": "orderAmount",
-      "search": false,
+      "search": true,
       "index": 6,
       "width": 100,
       "overHidden": true

src/views/businessManagement/receipt/configuration/mainList.json

@@ -5,6 +5,7 @@
   "stripe": true,
   "addBtnText": "创建单据",
   "searchShow": true,
+  "height": "auto",
   "searchMenuPosition": "right",
   "dialogWidth": "60%",
   "tree": true,
@@ -204,7 +205,13 @@
     {
       "label": "状态",
       "prop": "deliveryStatus",
-      "search": false,
+      "type": "select",
+      "dicUrl": "/api/blade-system/dict-biz/dictionary?code=delivery_status",
+      "props": {
+        "label": "dictValue",
+        "value": "dictKey"
+      },
+      "search": true,
       "index": 18,
       "width": 100,
       "overHidden": true

src/views/businessManagement/receipt/index.vue

@@ -21,6 +21,10 @@
         <template slot="corpIdSearch">
           <crop-select v-model="search.corpId" corpType="GYS"></crop-select>
         </template>
+        <template slot-scope="{ row }" slot="deliveryStatus">
+          <span>{{row.deliveryStatus}}</span>
+<!--          <span v-for="item in $refs.crud.DIC.deliveryStatus" :style="{color: item.colour}" v-if="item.dictKey == row.status">{{item.dictValue}}</span>-->
+        </template>
         <template slot-scope="scope" slot="corpId">
           <span style="color: #409EFF;cursor: pointer" @click.stop="beforeOpenPage(scope.row, scope.index)">{{
               scope.row.corpsName
@@ -135,6 +139,10 @@ export default {
       this.findObject(this.option.column, "purchaseMode").dicData =
           res.data.data;
     });
+    this.getWorkDicts("delivery_status").then(res => {
+      this.findObject(this.option.column, "deliveryStatus").dicData =
+          res.data.data;
+    });
     let i = 0;
     this.option.column.forEach(item => {
       if (item.search) i++
@@ -193,11 +201,11 @@ export default {
       return "padding:0;height:40px;";
     },
     searchCriteriaSwitch(type) {
-      if (type) {
-        this.option.height = this.option.height - 190
-      } else {
-        this.option.height = this.option.height + 190
-      }
+      // if (type) {
+      //   this.option.height = this.option.height - 190
+      // } else {
+      //   this.option.height = this.option.height + 190
+      // }
       this.$refs.crud.getTableHeight()
     },
     //确认发货
@@ -207,9 +215,18 @@ export default {
         cancelButtonText: "取消",
         type: "warning"
       }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(255,255,255,0.7)'
+        });
         sendInGoods({id:row.id}).then(res => {
           this.$message.success('发货成功')
+          loading.close();
           this.onLoad(this.page, this.search)
+        }).catch(()=>{
+          loading.close();
         })
       });
     },
@@ -393,7 +410,7 @@ export default {
       customerList(queryParams).then(res => {
         this.dataList = res.data.data.records
         this.page.total = res.data.data.total
-        this.option.height = window.innerHeight - 240;
+        // this.option.height = window.innerHeight - 240;
       }).finally(() => {
         this.loading = false;
       })

src/views/purchaseOrder/detailsPage.vue

@@ -71,17 +71,17 @@
             </span>
           </template>
           <template slot="storageInQuantity" slot-scope="{ row, index }">
-            <el-input-number v-if="row.$cellEdit" v-model="row.storageInQuantity" @change="countChange(row)"
+            <el-input-number v-if="row.$cellEdit" min="0" v-model="row.storageInQuantity" @change="countChange(row)"
               placeholder="请输入" size="small" :controls="false" style="width:100%;"></el-input-number>
             <span v-else>{{ row.storageInQuantity }}</span>
           </template>
           <template slot="price" slot-scope="{ row, index }">
-            <el-input-number v-if="row.$cellEdit" v-model="row.price" @change="countChange(row)" placeholder="请输入"
+            <el-input-number v-if="row.$cellEdit" v-model="row.price" min="0" @change="countChange(row)" placeholder="请输入"
               size="small" :controls="false" style="width:100%;"></el-input-number>
             <span v-else>{{ row.price }}</span>
           </template>
           <template slot="purchaseAmount" slot-scope="{ row, index }">
-            <el-input-number v-if="row.$cellEdit" v-model="row.purchaseAmount" @change="countChange(row)"
+            <el-input-number v-if="row.$cellEdit" v-model="row.purchaseAmount" min="0" @change="countChange(row)"
               placeholder="请输入" size="small" :controls="false" style="width:100%;"></el-input-number>
             <span v-else>{{ row.purchaseAmount }}</span>
           </template>

src/views/purchaseOrder/index.vue

@@ -16,6 +16,10 @@
           <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 1)">{{ row.corpsName }}
           </span>
         </template>
+        <template slot-scope="{ row, index }" slot="sysNo">
+          <span style="color: #409EFF;cursor: pointer" @click.stop="editOpen(row, 1)">{{ row.sysNo }}
+          </span>
+        </template>
         <template slot="businesDateSearch">
           <el-date-picker v-model="search.businesDate" type="daterange" start-placeholder="开始日期" end-placeholder="结束日期"
             format="yyyy-MM-dd" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
@@ -53,7 +57,7 @@
     <details-page v-if="!show" @goBack="goBack()" :detailData="detailData" />
   </div>
 </template>
-  
+
 <script>
 import detailsPage from "./detailsPage";
 import { option } from "./js/optionList";
@@ -218,6 +222,9 @@ export default {
         .then(res => {
           this.dataList = res.data.data.records ? res.data.data.records : [];
           this.page.total = res.data.data.total;
+          this.$nextTick(() => {
+            this.$refs.crud.doLayout();
+          });
         })
         .finally(() => {
           this.loading = false;
@@ -291,7 +298,7 @@ export default {
   }
 }
 </script>
-  
+
 <style  lang="scss"  scoped>
 .page-crad ::v-deep .basic-container__card {
   height: 94.2vh;
@@ -328,4 +335,3 @@ export default {
   }
 }
 </style>
-  

src/views/purchaseOrder/js/optionList.js

@@ -40,6 +40,7 @@ export const option = {
     {
       label: "单号",
       prop: "sysNo",
+      width:165,
       overHidden: true,
       search: true,
       index: 1
@@ -185,6 +186,9 @@ export const optionList = {
     {
       label: "数量",
       prop: "storageInQuantity",
+      type: 'number',
+      minRows: 0,
+      controls: false,
       overHidden: true
     },
     {
@@ -202,11 +206,17 @@ export const optionList = {
     {
       label: "单价",
       prop: "price",
+      type: 'number',
+      minRows: 0,
+      controls: false,
       overHidden: true
     },
     {
       label: "金额",
       prop: "amount",
+      type: 'number',
+      minRows: 0,
+      controls: false,
       overHidden: true
     },
     {
@@ -214,6 +224,7 @@ export const optionList = {
       prop: "actualQuantity",
       type: 'number',
       controls: false,
+      minRows: 0,
       cell: true,
       overHidden: true
     },
@@ -222,12 +233,12 @@ export const optionList = {
       prop: "remarks",
       cell: true,
       overHidden: true
-    },
-    {
-      label: "进价",
-      prop: "purchasePrice",
-      overHidden: true
     }
+    // ,{
+    //   label: "进价",
+    //   prop: "purchasePrice",
+    //   overHidden: true
+    // }
   ]
 }
 
@@ -281,4 +292,4 @@ export const feeOption = {
       overHidden: true
     }
   ]
-}
+}

src/views/salesOrder/detailsPage.vue

@@ -306,6 +306,17 @@ export default {
         disabled: false,
         column: [
           {
+            label: "订单金额",
+            prop: "purchaseAmount",
+            disabled: true,
+            span: 4,
+          },
+          {
+            label: "优惠金额",
+            prop: "thisUsedProfit",
+            span: 4,
+          },
+          {
             label: "税率",
             prop: "exchangeRate",
             type: "select",
@@ -335,15 +346,10 @@ export default {
             span: 4,
           },
           {
-            label: "订单金额",
-            prop: "purchaseAmount",
+            label: "已收金额",
+            prop: "settlmentAmount",
             disabled: true,
-            span: 4,
-          },
-          {
-            label: "优惠金额",
-            prop: "thisUsedProfit",
-            span: 4,
+            span: 8,
           },
           {
             label: "合同金额",
@@ -356,12 +362,6 @@ export default {
             prop: "balanceAmount",
             disabled: true,
             span: 8,
-          },
-          {
-            label: "已收金额",
-            prop: "settlmentAmount",
-            disabled: true,
-            span: 8,
           }
         ]
       },
@@ -492,14 +492,6 @@ export default {
     if (this.detailData.id) {
       this.getDetail(this.detailData.id);
     }
-    console.log(this.detailData)
-    if (this.detailData.billType == "XS"){
-      this.findObject(this.option.column, "sysNo").label = "销售单号";
-      this.findObject(this.option.column, "srcOrderNo").label = "退款单号";
-    }else if (this.detailData.billType == "XSTH"){
-      this.findObject(this.option.column, "sysNo").label = "退款单号";
-      this.findObject(this.option.column, "srcOrderNo").label = "销售单号";
-    }
     if (this.detailData.status == 1) {
       this.option.disabled = true;
       this.option2.disabled = true;
@@ -590,8 +582,7 @@ export default {
           this.settlementList = res.data.data.settlementList;
           this.orderFilesList = res.data.data.orderFilesList ? res.data.data.orderFilesList : [];
           this.getAddress(res.data.data)
-        })
-        .finally(() => {
+        }).finally(() => {
           this.loadingBtn = false;
         });
     },
@@ -616,6 +607,13 @@ export default {
       getCorpDetails({ id: row.corpId }).then(res => {
         this.findObject(this.option.column, "arrivalAddress").dicData = res.data.data.corpsAddrList;
       })
+      if (this.form.billType == "XS"){
+        this.findObject(this.option.column, "sysNo").label = "销售单号";
+        this.findObject(this.option.column, "srcOrderNo").label = "退款单号";
+      }else if (this.form.billType == "XSTH"){
+        this.findObject(this.option.column, "sysNo").label = "退款单号";
+        this.findObject(this.option.column, "srcOrderNo").label = "销售单号";
+      }
     },
     addRow() {
       this.$refs["form"].validate((valid, done) => {

src/views/salesOrder/index.vue

@@ -85,7 +85,7 @@
           <el-col :span="24">
             <el-form-item label="快递公司:" label-width="100px">
 <!--              <el-input v-model="form.courierCorporation" placeholder="请输入快递公司" size="small" style="width: 100%;"></el-input>-->
-              <el-select v-model="form.courierCorporation" placeholder="请选择快递公司" clearable filterable size="small" style="width: 100%;">
+              <el-select v-model="form.courierCorporation" placeholder="请选择快递公司" clearable filterable size="small" style="width: 90%;">
                 <el-option
                     v-for="item in courierServices"
                     :key="item.dictKey"
@@ -97,7 +97,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="快递单号:" label-width="100px">
-              <el-input v-model="form.courierNumber" placeholder="请输入快递单号" size="small" style="width: 100%;"></el-input>
+              <el-input v-model="form.courierNumber" placeholder="请输入快递单号" size="small" style="width: 90%;"></el-input>
             </el-form-item>
           </el-col>
         </el-form>
@@ -364,27 +364,35 @@ export default {
         this.$alert('是否继续发货', '未填写快递单号', {
           confirmButtonText: '确定',
           callback: action => {
-            const loading = this.$loading({
-              lock: true,
-              text: '加载中',
-              spinner: 'el-icon-loading',
-              background: 'rgba(255,255,255,0.7)'
-            });
-            delivery({
-              id:this.form.id,
-              courierNumber:this.form.courierNumber,
-              courierCorporation:this.form.courierCorporation
-            }).then(res=>{
-              loading.close();
-              this.$message.success("发货成功")
-              this.dialogVisible = false
-              this.onLoad(this.page)
-            }).catch(()=>{
-              loading.close();
-            })
+            if (action === "confirm"){
+              const loading = this.$loading({
+                lock: true,
+                text: '加载中',
+                spinner: 'el-icon-loading',
+                background: 'rgba(255,255,255,0.7)'
+              });
+              delivery({
+                id:this.form.id,
+                courierNumber:this.form.courierNumber,
+                courierCorporation:this.form.courierCorporation
+              }).then(res=>{
+                loading.close();
+                this.$message.success("发货成功")
+                this.dialogVisible = false
+                this.onLoad(this.page)
+              }).catch(()=>{
+                loading.close();
+              })
+            }
           }
         });
       }else{
+        const loading = this.$loading({
+          lock: true,
+          text: '加载中',
+          spinner: 'el-icon-loading',
+          background: 'rgba(255,255,255,0.7)'
+        });
         delivery({
           id:this.form.id,
           courierNumber:this.form.courierNumber,
@@ -392,7 +400,10 @@ export default {
         }).then(res=>{
           this.$message.success("发货成功")
           this.dialogVisible = false
+          loading.close();
           this.onLoad(this.page)
+        }).catch(()=>{
+          loading.close();
         })
       }
     },

src/views/salesOrder/js/optionList.js

@@ -43,6 +43,7 @@ export const option = {
       prop: "sysNo",
       overHidden: true,
       search: true,
+      width:165,
       index: 1
     },
     {

src/views/statisticAnalysis/dataDetail/index.vue

@@ -320,14 +320,27 @@ export default {
           endCreateTime: '',
         }
       }
+      if (params.receiptTimeList && params.receiptTimeList.length > 0) {
+        params = {
+          ...params,
+          "beginReceiptTime": params.receiptTimeList[0] + ' 00:00:00',
+          "endReceiptTime": params.receiptTimeList[1] + ' 23:59:59',
+        }
+      } else {
+        params = {
+          ...params,
+          "beginReceiptTime": '',
+          "endReceiptTime": '',
+        }
+      }
       this.$confirm('是否导出数据明细？', '提示', {
         confirmButtonText: '确定',
         cancelButtonText: '取消',
         type: 'warning'
       }).then(() => {
         window.open(
-          `/api/blade-purchase-sales/orderitems/dateset-export?${this.website.tokenHeader
-          }=${getToken()}&corpName=${params.corpName}&beginCreateTime=${params.beginCreateTime}&endCreateTime=${params.endCreateTime}&orderNo=${params.orderNo}&gysName=${params.gysName}&belongCompany=${params.belongCompany}&packageRemarks=${params.packageRemarks}`
+            `/api/blade-purchase-sales/orderitems/dateset-export?${this.website.tokenHeader
+            }=${getToken()}&corpName=${params.corpName}&beginCreateTime=${params.beginCreateTime}&endCreateTime=${params.endCreateTime}&orderNo=${params.orderNo}&gysName=${params.gysName}&belongCompany=${params.belongCompany}&packageRemarks=${params.packageRemarks}&beginReceiptTime=${params.beginReceiptTime}&endReceiptTime=${params.endReceiptTime}`
         );
       }).catch(() => {
         this.$message({