Merge remote-tracking branch 'origin/dev' into dev

src/views/ecw/box/query.vue

@@ -6,9 +6,9 @@
           <h2>{{$t('出货详情')}}</h2>
           <div>
             <!-- <el-button size="small" @click="handleCommand('edit')">{{$t('编辑')}}</el-button> -->
-            <el-button size="small" @click="handleCommand('router')">{{$t('操作')}}</el-button>
-            <el-button type="primary" size="small" @click="handleCommand('error')">{{$t('异常登记')}}</el-button>
-            <el-button type="primary" size="small" @click="handleCommand('cost')">{{$t('费用登记')}}</el-button>
+            <el-button size="small" v-hasPermi="['shipment:box:action:sea']" @click="handleCommand('router')">{{$t('操作')}}</el-button>
+            <el-button type="primary" v-hasPermi="['shipment:box:action:error']" size="small" @click="handleCommand('error')">{{$t('异常登记')}}</el-button>
+            <el-button type="primary" v-hasPermi="['shipment:box:action:cost']" size="small" @click="handleCommand('cost')">{{$t('费用登记')}}</el-button>
             <!-- <el-button type="danger" size="small" @click="handleCommand('delete')">{{$t('删除')}}</el-button> -->
           </div>
         </div>

src/views/ecw/zhongPao/index.vue

@@ -194,10 +194,7 @@ export default {
     handleStatusChange(row){
       let text = row.status === CommonStatusEnum.ENABLE ? this.$t("启用") : this.$t("停用");
       this.$modal.confirm('确认要' + text + '吗?').then(function() {
-        return updateZhongPao({
-          id: row.id,
-          status: row.status
-        })
+        return updateZhongPao(row)
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
       }).catch(function() {
@@ -207,7 +204,7 @@ export default {
     },
     departureFormatter(row, column, cellValue) {
       if (cellValue === 0) return this.$t('全部')
-      return this.warehouseList.find(e => e.id === cellValue)?.titleZh
+      return this.tradeCityList.find(e => e.id === cellValue)?.titleZh
     },
     objectiveFormatter(row, column, cellValue) {
       if (!cellValue || cellValue.length === 0) return ''

src/views/infra/apiAccessLog/index.vue

@@ -19,8 +19,8 @@
         <el-input v-model="queryParams.requestUrl" :placeholder="$t('请输入请求地址')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('请求时间')">
-        <el-date-picker v-model="dateRangeBeginTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+        <el-date-picker v-model="dateRangeBeginTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
       <el-form-item :label="$t('执行时长')" prop="duration">
         <el-input v-model="queryParams.duration" :placeholder="$t('请输入执行时长')" clearable @keyup.enter.native="handleQuery"/>
@@ -160,7 +160,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime');
+      this.addBeginAndEndTime(params, this.dateRangeBeginTime, 'beginTime',false);
       // 执行查询
       getApiAccessLogPage(params).then(response => {
         this.list = response.data.list;

src/views/infra/apiErrorLog/index.vue

@@ -19,8 +19,8 @@
         <el-input v-model="queryParams.requestUrl" :placeholder="$t('请输入请求地址')" clearable @keyup.enter.native="handleQuery"/>
       </el-form-item>
       <el-form-item :label="$t('异常时间')">
-        <el-date-picker v-model="dateRangeExceptionTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+        <el-date-picker v-model="dateRangeExceptionTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
       <el-form-item :label="$t('处理状态')" prop="processStatus">
         <el-select v-model="queryParams.processStatus" :placeholder="$t('请选择处理状态')" clearable>
@@ -168,7 +168,7 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime');
+      this.addBeginAndEndTime(params, this.dateRangeExceptionTime, 'exceptionTime', false);
       // 执行查询
       getApiErrorLogPage(params).then(response => {
         this.list = response.data.list;

src/views/system/loginlog/index.vue

@@ -16,8 +16,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('登录时间')">
-        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
-          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
@@ -99,8 +99,8 @@ export default {
     getList() {
       this.loading = true;
       list(this.addDateRange(this.queryParams, [
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
+        this.dateRange[0] ,
+        this.dateRange[1],
       ])).then(response => {
           this.list = response.data.list;
           this.total = response.data.total;

src/views/system/operatelog/index.vue

@@ -22,8 +22,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('操作时间')">
-        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd"
-          type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
+        <el-date-picker v-model="dateRange" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+          type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
@@ -171,8 +171,8 @@ export default {
     getList() {
       this.loading = true;
       listOperateLog(this.addDateRange(this.queryParams, [
-        this.dateRange[0] ? this.dateRange[0] + ' 00:00:00' : undefined,
-        this.dateRange[1] ? this.dateRange[1] + ' 23:59:59' : undefined,
+        this.dateRange[0] ,
+        this.dateRange[1],
       ])).then( response => {
           this.list = response.data.list;
           this.total = response.data.total;

src/views/system/sms/smsLog.vue

@@ -23,8 +23,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('发送时间')">
-        <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+        <el-date-picker v-model="dateRangeSendTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
       <el-form-item :label="$t('接收状态')" prop="receiveStatus">
         <el-select v-model="queryParams.receiveStatus" :placeholder="$t('请选择接收状态')" clearable>
@@ -33,8 +33,8 @@
         </el-select>
       </el-form-item>
       <el-form-item :label="$t('接收时间')">
-        <el-date-picker v-model="dateRangeReceiveTime" style="width: 240px" value-format="yyyy-MM-dd"
-                        type="daterange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
+        <el-date-picker v-model="dateRangeReceiveTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss"
+                        type="datetimerange" range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
       </el-form-item>
       <el-form-item>
         <el-button type="primary" icon="el-icon-search" @click="handleQuery">{{ $t('搜索') }}</el-button>
@@ -45,7 +45,7 @@
     <!-- 操作工具栏 -->
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+        <el-button type="primary" plain icon="el-icon-plus" size="mini"
                    v-hasPermi="['system:sms-log:create']">{{ $t('新增') }}</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -243,8 +243,8 @@ export default {
       this.loading = true;
       // 处理查询参数
       let params = {...this.queryParams};
-      this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime');
-      this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime');
+      this.addBeginAndEndTime(params, this.dateRangeSendTime, 'sendTime', false);
+      this.addBeginAndEndTime(params, this.dateRangeReceiveTime, 'receiveTime', false);
       // 执行查询
       getSmsLogPage(params).then(response => {
         this.list = response.data.list;