Merge branch 'master' of http://47.100.3.209:3000/gdc/yiliangyiyun-pc

src/views/contractManagement/salesContract.vue

@@ -387,6 +387,16 @@
         }else{
           data={id: row.id}
         }
+        if(e=='执行中'){
+          if(row.addressUrl==''){
+            this.$notify.error({
+              title: '失败',
+              message: '修改失败，未上传双章合同附件',
+            })
+            return
+          }
+          console.log(row)
+        }
         this.$confirm(`是否将状态改为${e}`, {
             confirmButtonText: '确定',
             cancelButtonText: '取消',

src/views/home/index.vue

@@ -37,13 +37,13 @@
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart2" style="height: 288px;" class="roseChart"></div>
-                <div class="bottom-tip">统计单位：元</div>
+                <div class="bottom-tip">统计单位：万</div>
               </div>
             </el-col>
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart3" style="height: 288px;" class="roseChart"></div>
-                <div class="bottom-tip">统计单位：元</div>
+                <div class="bottom-tip">统计单位：万</div>
               </div>
             </el-col>
           </el-row>
@@ -117,13 +117,13 @@
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart5" style="height: 288px;" class="roseChart" @click="contract(1)"></div>
-                <div class="bottom-tip">统计单位：元</div>
+                <div class="bottom-tip">统计单位：万</div>
               </div>
             </el-col>
             <el-col :span="12" class="chart-card">
               <div style="font-weight: bold;">
                 <div ref="myEchart6" style="height: 288px;" class="roseChart" @click="contract(1)"></div>
-                <div class="bottom-tip">统计单位：元</div>
+                <div class="bottom-tip">统计单位：万</div>
               </div>
             </el-col>
           </el-row>
@@ -419,6 +419,7 @@
         this.position = Number(Number(this.physicalInventory)+Number(this.procurementPending) - Number(this.salesPending)).toFixed(2)
         this.totalReserves = res[8].biViewInfoList
         this.mapInfo = res[9]
+        console.log(res)
         this.initCharts()
       })
       // if (this.vesselBankFlag !== 'V') {
@@ -585,17 +586,17 @@
               color = ['#247ef4', '#3a3b40'];
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
-                name: '已开票',
-                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                name: '已开票1',
+                value: Number((this.chartsData[i].biViewInfoList[0].count)/10000).toFixed(2),
                 type: '采购合同'
               }, {
                 name: '待开票',
-                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[1].count)/10000).toFixed(2),
                 type: '采购合同'
               }]
               text = '合同总额'
-              formatter = '{b}{c}元 </br> 占比{d}%'
-              graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              formatter = '{b}{c}万 </br> 占比{d}%'
+              graphicText = ' \n\n开票合计\n\n' + Number((this.chartsData[i].total)/10000).toFixed(2)
               break;
             case 2:
               // 圆环图各环节的颜色
@@ -603,16 +604,16 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已付款',
-                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[0].count/10000)).toFixed(2),
                 type: '采购合同'
               }, {
                 name: '待付款',
-                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[1].count)/10000).toFixed(2),
                 type: '采购合同'
               }]
               text = '合同总额'
-              formatter = '{b}{c}元 </br> 占比{d}%'
-              graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              formatter = '{b}{c}万 </br> 占比{d}%'
+              graphicText = ' \n\n付款合计\n\n' + Number((this.chartsData[i].total)/10000).toFixed(2)
               break;
             case 3:
               // 圆环图各环节的颜色
@@ -636,14 +637,14 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已开票',
-                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[0].count)/10000).toFixed(2),
               }, {
                 name: '待开票',
-                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[1].count)/10000).toFixed(2),
               }]
               text = '合同总额'
-              formatter = '{b}{c}元 </br> 占比{d}%'
-              graphicText = ' \n\n开票合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              formatter = '{b}{c}万 </br> 占比{d}%'
+              graphicText = ' \n\n开票合计\n\n' + Number((this.chartsData[i].total)/10000).toFixed(2)
               break;
             case 5:
               // 圆环图各环节的颜色
@@ -651,14 +652,14 @@
               // 圆环图各环节的名称和值(系列中各数据项的名称和值)
               data = [{
                 name: '已付款',
-                value: Number(this.chartsData[i].biViewInfoList[0].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[0].count)/10000).toFixed(2),
               }, {
                 name: '待付款',
-                value: Number(this.chartsData[i].biViewInfoList[1].count).toFixed(2),
+                value: Number((this.chartsData[i].biViewInfoList[1].count)/10000).toFixed(2),
               }]
               text = '合同总额'
-              formatter = '{b}{c}元 </br> 占比{d}%'
-              graphicText = ' \n\n付款合计\n\n' + Number(this.chartsData[i].total).toFixed(2)
+              formatter = '{b}{c}万 </br> 占比{d}%'
+              graphicText = ' \n\n付款合计\n\n' + Number((this.chartsData[i].total)/10000).toFixed(2)
               break;
           }
           myChart.setOption({

src/views/houseSelfCollect/weightCheckRecord.vue

@@ -22,10 +22,13 @@
         </el-col>
         <el-col :span="12" class="bg-right">
           <div style="display:flex">
-            <el-select v-model="warehouseName" placeholder="请选择仓库名" @change="warehouseNameChange">
+            <el-select style='margin-right:5px;width:40%' v-model="warehouseName" placeholder="请选择仓库名" @change="warehouseNameChange">
               <el-option v-for="item in warehouseList" :key="item.id" :label="item.warehouseName"
                 :value="item.warehouseName"></el-option>
             </el-select>
+             <el-date-picker v-model="value2" type="daterange" align="right" unlink-panels range-separator="至"
+          start-placeholder="开始日期" end-placeholder="结束日期" :picker-options="pickerOptions">
+        </el-date-picker>
             <el-input :placeholder="warehousingType == 1 ? '可按业务编号、合同编号/移库编号、车牌号查找':'可按业务编号、车牌号、客户名查找'" clearable
               v-model="searchKeyWord" class="search_css"></el-input>
             <!-- <el-input placeholder="可按业务编号、车牌号、客户名查找" clearable v-model="searchKeyWord"></el-input> -->
@@ -162,9 +165,53 @@
         // binNumberId: '', //仓位Id
         // warehouseType: '',
         compId: '',
+        pickerOptions: {
+          shortcuts: [{
+              text: '本周',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                var thisDay = start.getDay()
+                var thisDate = start.getDate()
+                if (thisDay != 0) {
+                  start.setDate(thisDate - thisDay)
+                }
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本月',
+              onClick(picker) {
+                const end = new Date()
+                const start = new Date()
+                start.setDate(1)
+                picker.$emit('pick', [start, end])
+              },
+            },
+            {
+              text: '本季度',
+              onClick(picker) {
+                var oDate = new Date()
+
+                var thisYear = oDate.getFullYear()
+                var thisMonth = oDate.getMonth() + 1
+
+                var n = Math.ceil(thisMonth / 3) // 季度
+
+                var Month = n * 3 - 1
+
+                var start = new Date(thisYear, Month - 2, 1)
+                var end = new Date()
+
+                picker.$emit('pick', [start, end])
+              },
+            },
+          ],
+        },
         //分页
         currentPage: 1,
         pageSize: 10,
+        value2:[],
         deptCircularPage: {},
         deptBudgetTotal: 0,
         warehouseList: [], //仓库
@@ -216,6 +263,8 @@
         jjSelectPrintList: [],
         printSeparately: false,
         onePrint: false,
+        startDate:'',
+        endDate:''
       }
     },
     activated() {
@@ -263,8 +312,38 @@
         } else {
           this.printSeparately = false
         }
+      },
+       dateFormat(fmt, date) {
+        let ret
+        const opt = {
+          'Y+': date.getFullYear().toString(), // 年
+          'm+': (date.getMonth() + 1).toString(), // 月
+          'd+': date.getDate().toString(), // 日
+          'H+': date.getHours().toString(), // 时
+          // "M+": date.getMinutes().toString(),         // 分
+          // "S+": date.getSeconds().toString()          // 秒
+          // 有其他格式化字符需求可以继续添加，必须转化成字符串
+        }
+        for (let k in opt) {
+          ret = new RegExp('(' + k + ')').exec(fmt)
+          if (ret) {
+            fmt = fmt.replace(
+              ret[1],
+              ret[1].length == 1 ? opt[k] : opt[k].padStart(ret[1].length, '0')
+            )
+          }
+        }
+        return fmt
       },
       lookup() {
+        if (this.value2) {
+          this.startDate = this.dateFormat('YYYY-mm-dd', this.value2[0])
+          this.endDate = this.dateFormat('YYYY-mm-dd', this.value2[1])
+        } else {
+          this.startDate = ''
+          this.endDate = ''
+        }
+        this.currentPage = 1
         this.getList()
       },
       changeType(val) {
@@ -460,7 +539,9 @@
             warehouseName: this.warehouseName,
             managementType: 1,
             serviceManagementType: this.warehousingType,
-            statusType: this.choice
+            statusType: this.choice,
+            startDate: this.startDate,
+            endDate: this.endDate,
           })
           .toPromise()
           .then((response) => {

src/views/outboundManagement/weighingManagementNew.vue

@@ -262,8 +262,8 @@
           </el-col>
           <el-col :span="12">
             <div class="list-info">
-              <div style="justify-content: space-between" class="flex">
-                <div>
+              <div style="justify-content: space-between;" class="flex">
+                <div style="min-width:146px;">
                   <el-button v-if="tpyeNo == 1" @click="add" type="primary">新增</el-button>
                   <el-button v-if="tpyeNo == 1" @click="deletelist" type="danger">删除</el-button>
                   <el-button v-if="tpyeNo == 2" @click="statustypechangelist(3)"
@@ -2004,7 +2004,7 @@
     text-align: right;
     padding: 0 10px 0 20px;
     border-radius: 10px;
-    margin: 0 20px 20px 20px;
+    margin: 0 20px 20px 21px;
     position: absolute;
     top: 140px;
     width: 465px;