3/28

src/views/main/BookingLedger/detail/modules/rightContent.vue

@@ -77,9 +77,10 @@
               <a-input placeholder="请输入显示天数" v-decorator="['extData']" />
             </a-form-item>
           </a-col>
-          <a-col :span="12">
-            <a-form-item label="备注" :labelCol="labelCol" :wrapperCol="wrapperCol" has-feedback>
-              <a-input placeholder="请输入备注" v-decorator="['remark']" />
+          <a-col :span="24">
+            <a-form-item label="备注" :labelCol="labelCol2" :wrapperCol="wrapperCol2" has-feedback>
+              <!-- <a-input placeholder="请输入备注" v-decorator="['remark']" /> -->
+              <a-textarea placeholder="请输入备注" v-decorator="['remark']" :auto-size="{ minRows: 2 }" />
             </a-form-item>
           </a-col>
         </a-row>
@@ -331,11 +332,19 @@ export default {
       StatusVisibleForm: this.$form.createForm(this),
       labelCol: {
         xs: { span: 24 },
-        sm: { span: 7 }
+        sm: { span: 8 }
       },
       wrapperCol: {
         xs: { span: 24 },
-        sm: { span: 15 }
+        sm: { span: 16 }
+      },
+      labelCol2: {
+        xs: { span: 24 },
+        sm: { span: 4 }
+      },
+      wrapperCol2: {
+        xs: { span: 24 },
+        sm: { span: 20 }
       }
       // serviceData: []
     }
@@ -380,9 +389,9 @@ export default {
       immediate: true,
       handler(nD, oD) {
         console.log(nD)
-        BookingOrderGetGoodsStatusList({ bookingId: nD.id }).then(res => {
-          this.booGoodsStatusItem = res.data
-        })
+        // BookingOrderGetGoodsStatusList({ bookingId: nD.id }).then(res => {
+        //   this.booGoodsStatusItem = res.data
+        // })
         this.id = this.$route.query.id
         if (!nD.id) {
           // 切换路由需要修改
@@ -627,11 +636,11 @@ export default {
               date = new Date(+new Date(values.finishTime) + 8 * 3600 * 1000)
             }
           }
-
+          console.log(values)
           let data = {
             finishTime: date.toISOString(),
             remark: values.remark,
-            extData: values.remark
+            extData: values.extData
           }
 
           let AData = { ...this.GoodsStatusEditData, ...data }
@@ -663,21 +672,22 @@ export default {
           BookingOrderSaveGoodsStatus(ApiData)
             .then(res => {
               if (res.success) {
-                let data = []
-                this.booGoodsStatusItem.forEach(item => {
-                  let type = true
-                  ApiData.item.forEach(item2 => {
-                    if (item.systemCode == item2.systemCode) {
-                      type = false
-                      data.push(item2)
-                    }
-                  })
-                  if (type) {
-                    data.push(item)
-                  }
-                })
+                // let data = []
+                // this.booGoodsStatusItem.forEach(item => {
+                //   let type = true
+                //   ApiData.item.forEach(item2 => {
+                //     if (item.systemCode == item2.systemCode) {
+                //       type = false
+                //       data.push(item2)
+                //     }
+                //   })
+                //   if (type) {
+                //     data.push(item)
+                //   }
+                // })
                 this.$nextTick(() => {
-                  this.booGoodsStatusItem = data
+                  this.booGoodsStatusItem = res.data
+                  this.details.goodsStatus = res.data
                 })
                 this.$message.success('货物状态设置成功')
                 this.GoodsStatusVisible = false
@@ -759,12 +769,8 @@ export default {
       BookingOrderSaveGoodsStatus(ApiData)
         .then(res => {
           if (res.success) {
-            if (type == 'push') {
-              this.details.goodsStatus.push({
-                ...data,
-                finishTime: new Date(+new Date() + 8 * 3600 * 1000).toISOString()
-              })
-            }
+            this.booGoodsStatusItem = res.data
+            this.details.goodsStatus = res.data
           }
         })
         .catch(err => {

src/views/system/log/oplog/index.vue

@@ -5,8 +5,8 @@
         <a-form layout="inline">
           <a-row :gutter="48">
             <a-col :md="8" :sm="24">
-              <a-form-item label="日志名称">
-                <a-input v-model="queryParam.name" allow-clear placeholder="请输入日志名称" />
+              <a-form-item label="操作人名称">
+                <a-input v-model="queryParam.name" allow-clear placeholder="请输入操作人名称" />
               </a-form-item>
             </a-col>
             <a-col :md="8" :sm="24">
@@ -18,29 +18,51 @@
               <a-col :md="8" :sm="24">
                 <a-form-item label="是否成功">
                   <a-select v-model="queryParam.success" placeholder="请选择是否成功">
-                    <a-select-option v-for="(item,index) in successDict" :key="index" :value="item.code">
-                      {{ item.value }}</a-select-option>
+                    <a-select-option v-for="(item, index) in successDict" :key="index" :value="item.code">
+                      {{ item.value }}</a-select-option
+                    >
                   </a-select>
                 </a-form-item>
               </a-col>
-              <a-col :md="10" :sm="24">
+              <a-col :md="8" :sm="24">
                 <a-form-item label="操作时间">
                   <a-range-picker
                     v-model="queryParam.dates"
                     :show-time="{
                       hideDisabledOptions: true,
-                      defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')],
+                      defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')]
                     }"
-                    format="YYYY-MM-DD HH:mm:ss" />
+                    format="YYYY-MM-DD HH:mm:ss"
+                  />
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="url">
+                  <a-input v-model="queryParam.url" allow-clear placeholder="url" />
+                </a-form-item>
+              </a-col>
+              <a-col :md="8" :sm="24">
+                <a-form-item label="ip">
+                  <a-input v-model="queryParam.ip" allow-clear placeholder="ip" />
                 </a-form-item>
               </a-col>
             </template>
-            <a-col :md="!advanced && 8 || 24" :sm="24">
+            <a-col :md="(!advanced && 8) || 24" :sm="24">
               <span
                 class="table-page-search-submitButtons"
-                :style="advanced && { float: 'right', overflow: 'hidden' } || {} ">
+                :style="(advanced && { float: 'right', overflow: 'hidden' }) || {}"
+              >
                 <a-button type="primary" @click="$refs.table.refresh(true)">查询</a-button>
-                <a-button style="margin-left: 8px" @click="() => queryParam = {}">重置</a-button>
+                <a-button
+                  style="margin-left: 8px"
+                  @click="
+                    () =>
+                      (queryParam = {
+                        success: 1
+                      })
+                  "
+                  >重置</a-button
+                >
                 <a @click="toggleAdvanced" style="margin-left: 8px">
                   {{ advanced ? '收起' : '展开' }}
                   <a-icon :type="advanced ? 'up' : 'down'" />
@@ -57,8 +79,9 @@
         :columns="columns"
         :data="loadData"
         :alert="true"
-        :rowKey="(record) => record.id"
-        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
+        :rowKey="record => record.id"
+        :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+      >
         <template slot="operator" v-if="hasPerm('sysOpLog:delete')">
           <a-popconfirm @confirm="() => sysOpLogDelete()" placement="top" title="确认清空日志？">
             <a-button>清空日志</a-button>
@@ -90,21 +113,12 @@
   </div>
 </template>
 <script>
-  import {
-    STable,
-    Ellipsis,
-    XCard
-  } from '@/components'
-  import {
-    sysOpLogPage,
-    sysOpLogDelete
-  } from '@/api/modular/system/logManage'
-  import detailsOplog from './details'
-  import {
-    sysEnumDataList
-  } from '@/api/modular/system/enumManage'
-  import moment from 'moment'
-  export default {
+import { STable, Ellipsis, XCard } from '@/components'
+import { sysOpLogPage, sysOpLogDelete } from '@/api/modular/system/logManage'
+import detailsOplog from './details'
+import { sysEnumDataList } from '@/api/modular/system/enumManage'
+import moment from 'moment'
+export default {
   components: {
     XCard,
     STable,
@@ -115,9 +129,12 @@
     return {
       advanced: false,
       // 查询参数
-        queryParam: {},
+      queryParam: {
+        success: 1
+      },
       // 表头
-        columns: [{
+      columns: [
+        {
           title: '请求方式',
           dataIndex: 'reqMethod',
           scopedSlots: {
@@ -178,7 +195,7 @@
       ],
       // 加载数据方法 必须为 Promise 对象
       loadData: parameter => {
-          return sysOpLogPage(Object.assign(parameter, this.switchingDate())).then((res) => {
+        return sysOpLogPage(Object.assign(parameter, this.switchingDate())).then(res => {
           return res.data
         })
       },
@@ -231,7 +248,7 @@
     sysEnumDataList() {
       sysEnumDataList({
         enumName: 'YesOrNot'
-        }).then((res) => {
+      }).then(res => {
         this.successDict = res.data
       })
     },
@@ -239,7 +256,7 @@
      * 清空日志
      */
     sysOpLogDelete() {
-        sysOpLogDelete().then((res) => {
+      sysOpLogDelete().then(res => {
         if (res.success) {
           this.$message.success('清空成功')
           this.$refs.table.refresh(true)
@@ -256,14 +273,14 @@
       this.selectedRows = selectedRows
     }
   }
-  }
+}
 </script>
 <style lang="less">
-  .table-operator {
+.table-operator {
   margin-bottom: 18px;
-  }
+}
 
-  button {
+button {
   margin-right: 8px;
-  }
+}
 </style>