修改wenti

src/api/modular/main/BookingLedger.js

@@ -1175,3 +1175,11 @@ export function GetShippingOrderCompareResult (parameter) {
     params: parameter
   })
 }
+
+export function GetWebData(parameter) {
+  return axios({
+    url: '/BookingOrder/GetWebData',
+    method: 'get',
+    params: parameter
+  })
+}

src/views/main/BookingLedger/list/index.vue

@@ -254,9 +254,9 @@
                           :key="bindex">
                           <a-popover placement="topLeft" v-if="btn.staTime">
                             <div slot="content">{{ btn.staTime }}</div>
-                            <span :class="{ active: btn.isChecked }">{{ enmuBookingBtn(btn.staCode) }}</span>
+                            <span @click="handleGetWebDataYZ(row,btn.staCode)" :class="{ active: btn.isChecked }">{{ enmuBookingBtn(btn.staCode) }}</span>
                           </a-popover>
-                          <span :class="{ active: btn.isChecked }" v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
+                          <span style="cursor: pointer;" @click="handleGetWebDataYZ(row,btn.staCode)" :class="{ active: btn.isChecked }" v-else>{{ enmuBookingBtn(btn.staCode) }}</span>
                           <i
                             class="iconfont icon-xiaoyoujiantou"
                             :class="{ hide: bindex === row.bookstatus.length - 1 }"></i>
@@ -269,12 +269,13 @@
                   <div v-if="row.statuslogs1">
                     <div v-if="row.statuslogs1.length > 0">
                       <div class="billtrace-btn1">
+                        <a-spin :spinning="row.webDataLoad">
                           <a-popover placement="topLeft">
                             <div slot="content">
                               <div>
                                 <span class="txfcSpan" style="width: 120px;">箱号</span>
-                              <span class="txfcSpan">提箱</span>
+                                <span @click="handleGetWebData(row,'YARD')" class="txfcSpan">提箱</span>
-                              <span class="txfcSpan">返场</span>
+                                <span @click="handleGetWebData(row,'YARD')" class="txfcSpan">返场</span>
                               </div>
                               <div v-for="(item, index) in row.statuslogs1" :key="index">
                                 <span class="txfcSpan" style="width: 120px;">{{ item.cntrno }}</span>
@@ -282,9 +283,10 @@
                                 <span class="txfcSpan">{{ item.fcopTime }}</span>
                               </div>
                             </div>
-                          <div :class="{ active: row.statuslogs1[0].txopTime }">提箱</div>
+                            <div @click="handleGetWebData(row,'YARD')" :class="{ active: row.statuslogs1[0].txopTime }">提箱</div>
-                          <div :class="{ active: row.statuslogs1[0].fcopTime }">返场</div>
+                            <div @click="handleGetWebData(row,'YARD')" :class="{ active: row.statuslogs1[0].fcopTime }">返场</div>
                           </a-popover>
+                        </a-spin>
                       </div>
                     </div>
                   </div>
@@ -1099,7 +1101,12 @@
           </a-form-item>
         </a-form>
       </a-modal>
-
+      <a-modal :title="webDataTitle" width="1400px" :visible="webDataFlag" :footer="null" @cancel="webDataFlag = false">
+        <iframe frameborder="0" height="700px" style="width: 100%;" :srcdoc="webData">
+          <!-- <div v-html="webData" style="overflow: hidden;"></div> -->
+          <!-- {{ webData }} -->
+        </iframe>
+      </a-modal>
     </a-spin>
   </div>
 </template>
@@ -1141,7 +1148,8 @@ import {
   SaveBookingTxxp,
   GetDraftCompareResultInfo,
   BookingOrderDownload,
-  GetShippingOrderCompareResult
+  GetShippingOrderCompareResult,
+  GetWebData
 } from '@/api/modular/main/BookingLedger'
 
 import initData from './modules/initData'
@@ -1170,8 +1178,12 @@ export default {
     return {
       spinning: false,
       isUpload: false,
+      webDataTitle: '',
       markFlag: false,
+      webDataLoading: false,
       pdfLoading: false,
+      webDataFlag: false,
+      webData: '',
       marktitle: '',
       refshYZloading: false,
       nowFirst: false,
@@ -1340,6 +1352,49 @@ export default {
       this.getConfigUser(true)
       this.getCarrier()
     },
+    handleGetWebData(row, code) {
+      const data = {
+        bookingId: row.id,
+        webCode: code
+      }
+      this.webData = ''
+      this.webDataTitle = '场站数据'
+      row.webDataLoad = true
+      GetWebData(data).then(res => {
+        if (res.code === 200) {
+          this.webData = res.data
+          this.webDataFlag = true
+        } else {
+          this.$message.error(res.message)
+        }
+        row.webDataLoad = false
+      })
+    },
+    handleGetWebDataYZ(row, code) {
+      let webCode = ''
+      this.webData = ''
+      if (code === 'sta_haifang' || code === 'sta_cangdan') {
+        webCode = 'HLW_CD'
+        this.webDataTitle = '物流信息数据'
+      } else {
+        webCode = 'YGT'
+        this.webDataTitle = '云港通数据'
+      }
+      const data = {
+        bookingId: row.id,
+        webCode: webCode
+      }
+      row.refshYzitemLoad = true
+      GetWebData(data).then(res => {
+        if (res.code === 200) {
+          this.webData = res.data
+          this.webDataFlag = true
+        } else {
+          this.$message.error(res.message)
+        }
+        row.refshYzitemLoad = false
+      })
+    },
     bcClose() {
       this.bcObj = {}
     },
@@ -1375,6 +1430,7 @@ export default {
         }
         item.bookstatus = bookstatus
         item.refshYzitemLoad = false
+        item.webDataLoad = false
         item.dzmarkLoading = false
         item.czmarkLoading = false
         item.custnoLoading = false
@@ -2410,6 +2466,7 @@ export default {
               }
               item.bookstatus = bookstatus
               item.refshYzitemLoad = false
+              item.webDataLoad = false
               item.atdLoading = false
               item.rowDzMark = false
               item.rowCzMark = false

src/views/system/user/index.vue

@@ -9,8 +9,7 @@
             @select="handleClick"
             :defaultExpandAll="true"
             :defaultExpandedKeys="defaultExpandedKeys"
-            :replaceFields="replaceFields"
+            :replaceFields="replaceFields" />
-          />
         </div>
         <div v-else>
           <a-empty :image="simpleImage" />
@@ -31,8 +30,7 @@
                 <a-form-item label="状态">
                   <a-select v-model="queryParam.searchStatus" allow-clear placeholder="请选择状态" default-value="0">
                     <a-select-option v-for="(item, index) in statusDictTypeDropDown" :key="index" :value="item.code">
-                      {{ item.value }}</a-select-option
+                      {{ item.value }}</a-select-option>
-                    >
                   </a-select>
                 </a-form-item>
               </a-col>
@@ -52,23 +50,16 @@
           :alert="true"
           :pageSizeOptions="['10', '20', '50', '100']"
           :rowKey="record => record.id"
-          :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
+          :rowSelection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
-        >
           <template slot="operator">
-            <a-button
+            <a-button type="primary" v-if="hasPerm('sysUser:add')" icon="plus" @click="$refs.addForm.add()">新增用户
-              type="primary"
-              v-if="hasPerm('sysUser:add')"
-              icon="plus"
-              @click="$refs.addForm.add()"
-            >新增用户
             </a-button>
             <a-upload
               :customRequest="customRequest"
               :multiple="true"
               :showUploadList="false"
               name="file"
-              v-if="hasPerm('sysUser:import')"
+              v-if="hasPerm('sysUser:import')">
-            >
               <a-button icon="up-circle">导入</a-button>
             </a-upload>
             <a-button v-if="hasPerm('sysUser:export')" icon="down-circle" @click="sysUserExport()">导出 </a-button>
@@ -85,8 +76,7 @@
             <a-popconfirm
               placement="top"
               :title="text === 0 ? '确定停用该用户？' : '确定启用该用户？'"
-              @confirm="() => editUserStatus(text, record)"
+              @confirm="() => editUserStatus(text, record)">
-            >
               <a>{{ statusFilter(text) }}</a>
             </a-popconfirm>
           </span>
@@ -97,13 +87,11 @@
             <a v-if="hasPerm('sysUser:edit')" @click="$refs.editForm.edit(record)">编辑</a>
             <a-divider type="vertical" v-if="hasPerm('sysUser:edit')" />
             <a-dropdown
-              v-if="
+              v-if="hasPerm('sysUser:resetPwd') ||
-                hasPerm('sysUser:resetPwd') ||
                 hasPerm('sysUser:grantRole') ||
                 hasPerm('sysUser:grantData') ||
                 hasPerm('sysUser:delete')
-              "
+              ">
-            >
               <a class="ant-dropdown-link">
                 更多
                 <a-icon type="down" />
@@ -133,6 +121,16 @@
         <edit-form ref="editForm" @ok="handleOk" />
         <user-role-form ref="userRoleForm" @ok="handleOk" />
         <user-org-form ref="userOrgForm" @ok="handleOk" />
+        <a-modal title="重置密码" :width="600" :visible="resetPwdFlag" @ok="handleSubmitReset" @cancel="resetPwdFlag = false">
+          <a-form-model ref="resetForm" :rules="rules" :model="resetForm" :label-col="labelCol" :wrapper-col="wrapperCol">
+            <a-form-model-item label="新密码" prop="newPassword">
+              <a-input v-model="resetForm.newPassword" />
+            </a-form-model-item>
+            <a-form-model-item label="确认" prop="confirm">
+              <a-input v-model="resetForm.confirm" />
+            </a-form-model-item>
+          </a-form-model>
+        </a-modal>
       </a-card>
     </a-col>
   </a-row>
@@ -220,9 +218,20 @@ export default {
       sexDictTypeDropDown: [],
       statusDictTypeDropDown: [],
       treeLoading: true,
+      labelCol: { span: 4 },
+      wrapperCol: { span: 14 },
+      resetPwdFlag: false,
+      resetForm: {
+        confirm: '',
+        newPassword: ''
+      },
       simpleImage: Empty.PRESENTED_IMAGE_SIMPLE,
       replaceFields: {
         key: 'id'
+      },
+      rules: {
+        newPassword: [{ required: true, trigger: 'blur', min: 5, message: '请输入至少五个字符的账号！' }],
+        confirm: [{ required: true, message: '请输入', trigger: 'blur' }]
       }
     }
   },
@@ -323,20 +332,34 @@ export default {
         }
       })
     },
-    /**
+    handleSubmitReset() {
-     * 重置密码
+      this.$refs.resetForm.validate(valid => {
-     */
+        if (valid) {
-    resetPwd(record) {
+          if (this.resetForm.newPassword !== this.resetForm.confirm) {
+            this.$message.warning('两次输入的密码不一致')
+          } else {
             sysUserResetPwd({
-        id: record.id
+              id: this.resetPwdFId,
+              ...this.resetForm
             }).then(res => {
               if (res.success) {
                 this.$message.success('重置成功')
-          // this.$refs.table.refresh()
+                this.resetPwdFlag = false
               } else {
-          this.$message.error('重置失败：' + res.message)
+                this.$message.error('重置失败：' + res.message.newPassword[0])
               }
             })
+          }
+        }
+      })
+    },
+    /**
+     * 重置密码
+     */
+    resetPwd(record) {
+      this.resetPwdFlag = true
+      this.resetPwdFId = record.id
+      this.resetForm = {}
     },
     /**
      * 删除用户