Procházet zdrojové kódy

Merge branch 'master' of http://139.196.39.194:9021/chenc/sen-yu-new-web

zengtx před 2 roky
rodič
revize
512d05d498

+ 1 - 1
.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8080/jeecg-boot
+VUE_APP_API_BASE_URL=http://220.191.168.86:18001/jeecg-boot
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

+ 2 - 0
src/api/document/order.js

@@ -8,4 +8,6 @@ const orderList = params => getAction('/orderData/syOrderData/list', params)
 // 根据订单号查询 (详情)
 const orderByNum = params => getAction('/orderData/syOrderDataItem/list', params)
 
+//同步
+
 export { orderList, orderByNum }

+ 42 - 7
src/views/order/orderDetailDrawer.vue

@@ -156,6 +156,8 @@
 import { JeecgListMixin } from '@/mixins/JeecgListMixin'
 import JEllipsis from '@/components/jeecg/JEllipsis'
 import moment from 'moment'
+import { orderByNum } from '@api/document/order'
+
 export default {
   name: 'OrderList',
   mixins: [JeecgListMixin],
@@ -188,7 +190,7 @@ export default {
           },
           className: 'replacecolor'
         },
-        { title: 'Pack Id', width: 100, dataIndex: 'packId', className: 'replacecolor' },
+        { title: 'Pack Id', width: 120, dataIndex: 'packId', className: 'replacecolor' },
         { title: '小po', width: 100, dataIndex: 'smallPo', className: 'replacecolor' },
         { title: '分销点', width: 150, dataIndex: 'distributionPoint', className: 'replacecolor' },
         { title: '存货编码', width: 120, dataIndex: 'inventoryCode', className: 'replacecolor' },
@@ -220,14 +222,46 @@ export default {
       // 分页
       pagination: {
         // total: '',
-        // current: 0,
-        // pageSize: 0
+        // current: '',
+        // pageSize: ''
       },
-      dateFormat: 'YYYY-MM-DD'
+      dateFormat: 'YYYY-MM-DD',
+      record: {} //点击的订单对象
     }
   },
-  created() {},
+  // 接收父组件查询方法
+  // props: {
+  //   fatherList: {
+  //     type: Function,
+  //     default: null
+  //   }
+  // },
+  created() {
+    console.log('详情created0')
+    this.getOrderChild()
+    console.log('详情created1')
+  },
   methods: {
+    // 子表信息获取
+    getOrderChild() {
+      this.$nextTick(() => {
+        console.log('详情拿到订单号', record.orderNumber)
+        orderByNum({ orderNumber: record.orderNumber }).then(res => {
+          if (res.success) {
+            // 子表信息赋值
+            this.childData = res.result.records
+            this.pagination = {
+              total: res.result.total,
+              current: res.result.current,
+              pageSize: res.result.size
+            }
+            console.log('childData', this.childData)
+            console.log('分页信息:', this.pagination.total, this.pagination.current, this.pagination.pageSize)
+          }
+        })
+      })
+    },
+
     // 回显主表信息 正常应该通过id查询
     onClose() {
       // 关闭抽屉
@@ -240,8 +274,9 @@ export default {
         this.isorter.column = sorter.field
         this.isorter.order = sorter.order == 'ascend' ? 'asc' : 'desc'
       }
-      this.queryParam.pageNo = pagination.current
-      // this.getOrderList()
+      console.log('详情 分页000')
+      this.getOrderChild()
+      console.log('详情 分页111')
     }
   },
   computed: {},

+ 34 - 14
src/views/order/orderList.vue

@@ -89,7 +89,7 @@
       </div>
     </a-card>
     <!-- 订单数据明细 抽屉 -->
-    <orderDetail-drawer ref="orderDetailDrawer" @ok="modalFormOk"></orderDetail-drawer>
+    <orderDetail-drawer ref="orderDetailDrawer" :fatherList="getOrderList" @ok="modalFormOk"></orderDetail-drawer>
   </div>
 </template>
 
@@ -113,10 +113,11 @@ export default {
       orderLIstColumns: [
         {
           title: '订单号',
-          width: 140,
+          width: 180,
           dataIndex: 'orderNumber',
           fixed: 'left',
           className: 'replacecolor',
+          // customRender: t => ellipsis(t),
           customCell: this.showDrawer,
           scopedSlots: { customRender: 'orderNumber' }
         },
@@ -212,7 +213,7 @@ export default {
         orderList(this.queryParam).then(res => {
           if (res.success) {
             this.orderListData = res.result.records
-            console.log('订单数据列表', this.orderListData)
+            // console.log('订单数据列表', this.orderListData)s
             this.pagination = {
               total: res.result.total,
               current: res.result.current,
@@ -222,11 +223,13 @@ export default {
         })
       })
     },
+
     // 查询按钮
     searchQuery() {
       this.getOrderList()
       console.log('发货状态', this.queryParam.dilivery)
     },
+
     searchReset() {
       // console.log('>>>>重置')
       this.queryParam = {}
@@ -238,18 +241,33 @@ export default {
       return {
         on: {
           click: event => {
-            console.log('点击的订单号', record.orderNumber)
+            // console.log('点击的订单号', record.orderNumber)
             this.$refs.orderDetailDrawer.visible = true
+            this.$refs.orderDetailDrawer.record = record
+            this.$refs.orderDetailDrawer.getOrderChild()
+            console.log('---', this.$refs.orderDetailDrawer.record)
+            console.log('打开订单详情')
             // 子表信息获取
-            orderByNum({ orderNumber: record.orderNumber }).then(res => {
-              if (res.success) {
-                console.log('子表详情', res.result)
-                // 子表信息赋值
-                this.$refs.orderDetailDrawer.childData = res.result
-                console.log('主表信息', record)
-                this.$refs.orderDetailDrawer.orderDetail = record
-              }
-            })
+            // orderByNum({ orderNumber: record.orderNumber }).then(res => {
+            //   if (res.success) {
+            //     // 子表信息赋值
+            //     this.$refs.orderDetailDrawer.childData = res.result.records
+            //     this.$refs.orderDetailDrawer.pagination = {
+            //       total: res.result.total,
+            //       current: res.result.current,
+            //       pageSize: res.result.size
+            //     }
+            //     console.log('childData', this.$refs.orderDetailDrawer.childData)
+            //     console.log(
+            //       '分页信息:',
+            //       this.$refs.orderDetailDrawer.pagination.total,
+            //       this.$refs.orderDetailDrawer.pagination.current,
+            //       this.$refs.orderDetailDrawer.pagination.pageSize
+            //     )
+            //     // console.log('主表信息', record)
+            //     this.$refs.orderDetailDrawer.orderDetail = record
+            //   }
+            // })
           }
         }
       }
@@ -262,7 +280,7 @@ export default {
     },
     // 同步
     synchronization() {
-      console.log('订单数据--同步');
+      console.log('订单数据--同步')
     },
 
     // 分页变化时触发
@@ -273,7 +291,9 @@ export default {
         this.isorter.order = sorter.order == 'ascend' ? 'asc' : 'desc'
       }
       this.queryParam.pageNo = pagination.current
+      // console.log('00');
       this.getOrderList() //重新渲染
+      // console.log('\\\\');
     }
   },
   computed: {},

+ 4 - 10
src/views/shipment-details/addShipDetDrawer.vue

@@ -675,10 +675,6 @@ export default {
       newObj.memo = this.addShipDet.memo // U8系统适用
       newObj.syShippingDetailsItemList = this.syShippingDetailsItemList // 子表信息赋值
 
-      // 单据状态
-      // newObj.state = this.state
-      // newObj.pushState = this.pushState
-
       // 必须选择子表 --- 参照订单数据
       if (newObj.syShippingDetailsItemList.length == 0) {
         this.$message.error('请选择参照订单数据')
@@ -741,13 +737,13 @@ export default {
     // --------------------------------------
     // 操作 删除
     handleDelete(index) {
-      console.log('index', index)
-      console.log('删除该项订单数据', index)
+      // console.log('index', index)
+      // console.log('删除该项订单数据', index)
       return this.syShippingDetailsItemList.splice(index, 1)
     },
     // 操作 复制 复制一行已有的数据
     copy(record) {
-      console.log('复制的数据', record)
+      // console.log('复制的数据', record)
       this.syShippingDetailsItemList.push(record)
     },
     // --------------------------------------
@@ -766,12 +762,10 @@ export default {
 
     // 参照订单数据弹框 ok-------------------------------------
     referOrderDataOk() {
-      console.log('参照订单数据弹框确定')
+      // console.log('参照订单数据弹框确定')
       this.$refs.referOrderDataModal.referOrderDataModVis = false
     }
   },
-  computed: {},
-  mounted() {}
 }
 </script>
 <style lang="less" scoped>

+ 2 - 2
src/views/shipment-details/referOrderDataModal.vue

@@ -355,8 +355,8 @@ export default {
       queryParam: {
         orderNumber: '', // 订单号
         account: '',
-        pageNo: '', // 初始页
-        pageSize: '-1' // 每页显示条数
+        // pageNo: '', // 初始页
+        // pageSize: '-1' // 每页显示条数
       },
       // 分页
       pagination: {

+ 1 - 1
src/views/shipment-details/shipmentList.vue

@@ -199,7 +199,7 @@
       <addShipDet-drawer ref="addShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk"></addShipDet-drawer>
       <detailsShipDet-drawer ref="detailsShipDetDrawer" @ok="modalFormOk"></detailsShipDet-drawer>
       <editShipDet-drawer ref="editShipDetDrawer" :fatherList="getShipmentList" @ok="modalFormOk"></editShipDet-drawer>
-      <!-- 申报要素 弹框 @bao="getSon"-->
+      <!-- 申报要素 弹框 -->
       <declareElements-modal ref="declareElementsModal"></declareElements-modal>
     </div>
   </div>

+ 129 - 126
src/views/user/LoginAccount.vue

@@ -1,18 +1,20 @@
 <template>
-    <div>
-      <a-form-model ref="form" :model="model" :rules="validatorRules">
-        <a-form-model-item required prop="username">
-          <a-input v-model="model.username" size="large" placeholder="请输入帐户名 / admin">
-            <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-          </a-input>
-        </a-form-model-item>
-        <a-form-model-item required prop="password">
-          <a-input v-model="model.password" size="large" type="password" autocomplete="false" placeholder="请输入密码 / 123456">
-            <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-          </a-input>
-        </a-form-model-item>
+  <div>
+    <a-form-model ref="form" :model="model" :rules="validatorRules">
+      <a-form-model-item required prop="username">
+        <a-input v-model="model.username" size="large" placeholder="请输入帐户名 ">
+          <!-- / admin -->
+          <a-icon slot="prefix" type="user" :style="{ color: 'rgba(0,0,0,.25)' }" />
+        </a-input>
+      </a-form-model-item>
+      <a-form-model-item required prop="password">
+        <a-input v-model="model.password" size="large" type="password" autocomplete="false" placeholder="请输入密码 ">
+          <!-- / 123456 -->
+          <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }" />
+        </a-input>
+      </a-form-model-item>
 
-        <!-- <a-row :gutter="0">
+      <!-- <a-row :gutter="0">
           <a-col :span="16">
             <a-form-model-item required prop="inputCode">
               <a-input v-model="model.inputCode" size="large" type="text" placeholder="请输入验证码">
@@ -25,134 +27,135 @@
             <img v-else style="margin-top: 2px;" src="../../assets/checkcode.png" @click="handleChangeCheckCode"/>
           </a-col>
         </a-row> -->
-      </a-form-model>
-    </div>
+    </a-form-model>
+  </div>
 </template>
 
 <script>
-  import { getAction } from '@/api/manage'
-  import Vue from 'vue'
-  import { mapActions } from 'vuex'
-
-  export default {
-    name: 'LoginAccount',
-    data(){
-      return {
-        requestCodeSuccess: false,
-        randCodeImage: '',
-        currdatetime: '',
-        loginType: 0,
-        model:{
-          username: '',
-          password: '',
-          inputCode: ''
-        },
-        validatorRules:{
-          username: [
-            { required: true, message: '请输入用户名!' },
-            { validator: this.handleUsernameOrEmail }
-          ],
-          password: [{
-            required: true, message: '请输入密码!', validator: 'click'
-          }]
-          // ,
-          // inputCode: [{
-          //   required: true, message: '请输入验证码!'
-          // }]
-        }
+import { getAction } from '@/api/manage'
+import Vue from 'vue'
+import { mapActions } from 'vuex'
 
+export default {
+  name: 'LoginAccount',
+  data() {
+    return {
+      requestCodeSuccess: false,
+      randCodeImage: '',
+      currdatetime: '',
+      loginType: 0,
+      model: {
+        username: '',
+        password: '',
+        inputCode: ''
+      },
+      validatorRules: {
+        username: [{ required: true, message: '请输入用户名!' }, { validator: this.handleUsernameOrEmail }],
+        password: [
+          {
+            required: true,
+            message: '请输入密码!',
+            validator: 'click'
+          }
+        ]
+        // ,
+        // inputCode: [{
+        //   required: true, message: '请输入验证码!'
+        // }]
       }
-    },
-    created() {
-      this.handleChangeCheckCode();
-    },
-    methods:{
-      ...mapActions(['Login']),
-      /**刷新验证码*/
-      handleChangeCheckCode(){
-        this.currdatetime = new Date().getTime();
-        this.model.inputCode = ''
-        getAction(`/sys/randomImage/${this.currdatetime}`).then(res=>{
-          if(res.success){
+    }
+  },
+  created() {
+    this.handleChangeCheckCode()
+  },
+  methods: {
+    ...mapActions(['Login']),
+    /**刷新验证码*/
+    handleChangeCheckCode() {
+      this.currdatetime = new Date().getTime()
+      this.model.inputCode = ''
+      getAction(`/sys/randomImage/${this.currdatetime}`)
+        .then(res => {
+          if (res.success) {
             this.randCodeImage = res.result
-            this.requestCodeSuccess=true
-          }else{
+            this.requestCodeSuccess = true
+          } else {
             this.$message.error(res.message)
-            this.requestCodeSuccess=false
+            this.requestCodeSuccess = false
           }
-        }).catch(()=>{
-          this.requestCodeSuccess=false
         })
-      },
-      // 判断登录类型
-      handleUsernameOrEmail (rule, value, callback) {
-        const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/;
-        if (regex.test(value)) {
-          this.loginType = 0
-        } else {
-          this.loginType = 1
-        }
-        callback()
-      },
-      /**
-       * 验证字段
-       * @param arr
-       * @param callback
-       */
-      validateFields(arr, callback){
-        let promiseArray = []
-        for(let item of arr){
-          let p = new Promise((resolve, reject) => {
-            this.$refs['form'].validateField(item, (err)=>{
-              if(!err){
-                resolve();
-              }else{
-                reject(err);
-              }
-            })
-          });
-          promiseArray.push(p)
-        }
-        Promise.all(promiseArray).then(()=>{
+        .catch(() => {
+          this.requestCodeSuccess = false
+        })
+    },
+    // 判断登录类型
+    handleUsernameOrEmail(rule, value, callback) {
+      const regex = /^([a-zA-Z0-9_-])+@([a-zA-Z0-9_-])+((\.[a-zA-Z0-9_-]{2,3}){1,2})$/
+      if (regex.test(value)) {
+        this.loginType = 0
+      } else {
+        this.loginType = 1
+      }
+      callback()
+    },
+    /**
+     * 验证字段
+     * @param arr
+     * @param callback
+     */
+    validateFields(arr, callback) {
+      let promiseArray = []
+      for (let item of arr) {
+        let p = new Promise((resolve, reject) => {
+          this.$refs['form'].validateField(item, err => {
+            if (!err) {
+              resolve()
+            } else {
+              reject(err)
+            }
+          })
+        })
+        promiseArray.push(p)
+      }
+      Promise.all(promiseArray)
+        .then(() => {
           callback()
-        }).catch(err=>{
+        })
+        .catch(err => {
           callback(err)
         })
-      },
-      acceptUsername(username){
-        this.model['username'] = username
-      },
-      //账号密码登录
-      handleLogin(rememberMe){
-        // [ 'username', 'password', 'inputCode' ]
-        //已经去掉验证码校验
-        this.validateFields([ 'username', 'password'], (err)=>{
-          if(!err){
-            let loginParams = {
-              username: this.model.username,
-              password: this.model.password,
-              captcha: this.model.inputCode,
-              checkKey: this.currdatetime,
-              remember_me: rememberMe,
-            }
-            console.log("登录参数", loginParams)
-            this.Login(loginParams).then((res) => {
+    },
+    acceptUsername(username) {
+      this.model['username'] = username
+    },
+    //账号密码登录
+    handleLogin(rememberMe) {
+      // [ 'username', 'password', 'inputCode' ]
+      //已经去掉验证码校验
+      this.validateFields(['username', 'password'], err => {
+        if (!err) {
+          let loginParams = {
+            username: this.model.username,
+            password: this.model.password,
+            captcha: this.model.inputCode,
+            checkKey: this.currdatetime,
+            remember_me: rememberMe
+          }
+          console.log('登录参数', loginParams)
+          this.Login(loginParams)
+            .then(res => {
               this.$emit('success', res.result)
-            }).catch((err) => {
+            })
+            .catch(err => {
               this.$emit('fail', err)
-            });
-          }else{
-            this.$emit('validateFail')
-          }
-        })
-      }
-
-
+            })
+        } else {
+          this.$emit('validateFail')
+        }
+      })
     }
-
   }
+}
 </script>
 
-<style scoped>
-
-</style>
+<style scoped></style>