chenrui 4 years ago
parent
commit
ea28275f61

+ 45 - 45
src/config/router.config.js

@@ -1710,52 +1710,52 @@ export const asyncRouterMap = [
             }
           }
         ]
-      },
-      // 系统设置
-      {
-        path: '/setting',
-        redirect: '/setting/userList',
-        component: PageView,
-        meta: {
-          title: '系统设置',
-          icon: 'setting'
-          // permission: 'M_setting_0'
-        },
-        children: [
-          {
-            path: '/setting/dataDictionary',
-            name: 'powerDD',
-            component: () => import(/* webpackChunkName: "setting" */
-              '@/views/power/dataDictionary/dataDictionary.vue'),
-            meta: {
-              title: '数据字典管理',
-              icon: 'database'
-              // permission: 'M_sys_dataDictionary'
-            }
-          },
-          // {
-          //   path: '/setting/register',
-          //   name: 'powerRegister',
-          //   component: () => import(/* webpackChunkName: "setting" */ '@/views/power/register/register.vue'),
-          //   meta: {
-          //     title: '参数管理',
-          //     icon: 'key',
-          //     permission: 'M_sys_register'
-          //   }
-          // },
-          {
-            path: '/setting/OperateJournal',
-            name: 'powerOperateJournal',
-            component: () => import(/* webpackChunkName: "setting" */
-              '@/views/power/OperateJournal/OperateJournal.vue'),
-            meta: {
-              title: '操作日志',
-              icon: 'read'
-              // permission: 'M_operateJournal'
-            }
-          }
-        ]
       }
+      // 系统设置
+      // {
+      //   path: '/setting',
+      //   redirect: '/setting/userList',
+      //   component: PageView,
+      //   meta: {
+      //     title: '系统设置',
+      //     icon: 'setting'
+      //     // permission: 'M_setting_0'
+      //   },
+      //   children: [
+      //     {
+      //       path: '/setting/dataDictionary',
+      //       name: 'powerDD',
+      //       component: () => import(/* webpackChunkName: "setting" */
+      //         '@/views/power/dataDictionary/dataDictionary.vue'),
+      //       meta: {
+      //         title: '数据字典管理',
+      //         icon: 'database'
+      //         // permission: 'M_sys_dataDictionary'
+      //       }
+      //     },
+      //     // {
+      //     //   path: '/setting/register',
+      //     //   name: 'powerRegister',
+      //     //   component: () => import(/* webpackChunkName: "setting" */ '@/views/power/register/register.vue'),
+      //     //   meta: {
+      //     //     title: '参数管理',
+      //     //     icon: 'key',
+      //     //     permission: 'M_sys_register'
+      //     //   }
+      //     // },
+      //     {
+      //       path: '/setting/OperateJournal',
+      //       name: 'powerOperateJournal',
+      //       component: () => import(/* webpackChunkName: "setting" */
+      //         '@/views/power/OperateJournal/OperateJournal.vue'),
+      //       meta: {
+      //         title: '操作日志',
+      //         icon: 'read'
+      //         // permission: 'M_operateJournal'
+      //       }
+      //     }
+      //   ]
+      // }
     ]
   },
   {

+ 4 - 0
src/views/inventoryManagement/inventoryQuery/detailModal.vue

@@ -8,6 +8,10 @@
     v-model="isShow"
     @cancle="isShow=false"
     width="80%">
+    <!-- 合计 -->
+    <a-alert type="info" showIcon style="margin-bottom:15px">
+      <div class="ftext" slot="message">现有库存总数量(个):<strong>998</strong>;现有库存总成本(¥):<strong>2009.00</strong>。</div>
+    </a-alert>
     <!-- 库存详情 -->
     <s-table
       class="sTable"

+ 58 - 58
src/views/purchasingManagement/purchaseOrder/basicInfoModal.vue

@@ -34,8 +34,8 @@
           allowClear></v-select>
       </a-form-model-item>
       <a-form-model-item label="收货地址" prop="name">
-        {{chooseAddr}}
-        <a-button type="link" id="purchaseOrder-basicInfo-chooseAddr" @click="handleChoose">{{addressVal}} >></a-button>
+        {{ chooseAddr }}
+        <a-button type="link" id="purchaseOrder-basicInfo-chooseAddr" @click="handleChoose">{{ addressVal }} >></a-button>
       </a-form-model-item>
     </a-form-model>
     <div class="btn-cont">
@@ -48,68 +48,68 @@
 </template>
 
 <script>
-  import { VSelect } from '@/components'
-  import chooseAddressModal from './receivingAddress/chooseAddressModal.vue'
-  export default{
-    name: 'BasicInfoModal',
-    components: { VSelect, chooseAddressModal },
-    props: {
-      openModal: { //  弹框显示状态
-        type: Boolean,
-        default: false
-      }
-    },
-    data(){
-      return{
-        isShow: this.openModal, //  是否打开弹框
-        formItemLayout: {
-          labelCol: { span: 6 },
-          wrapperCol: { span: 16 }
-        },
-        form: {
-          name: '', // 仓库名称
-          sort: '',  //  排序
-        },
-        rules: {
-          name: [
-            { required: true, message: '请输入仓库名称', trigger: 'blur' }
-          ],
-        },
-        addressVal: '选择地址',  //  选择地址/更换地址
-        chooseAddr: '',  //  当前已选地址信息
-        openAddrModal: false, // 选择地址弹框是否显示
-      }
-    },
-    methods: {
-      //  保存
-      handleSave(){
-        this.isShow = false
-        this.$emit('ok')
+import { VSelect } from '@/components'
+import chooseAddressModal from './receivingAddress/chooseAddressModal.vue'
+export default {
+  name: 'BasicInfoModal',
+  components: { VSelect, chooseAddressModal },
+  props: {
+    openModal: { //  弹框显示状态
+      type: Boolean,
+      default: false
+    }
+  },
+  data () {
+    return {
+      isShow: this.openModal, //  是否打开弹框
+      formItemLayout: {
+        labelCol: { span: 6 },
+        wrapperCol: { span: 16 }
       },
-      //  选择地址
-      handleChoose(){
-        this.openAddrModal = true
+      form: {
+        name: '', // 仓库名称
+        sort: '' //  排序
       },
-      //  地址保存
-      handleOk(data){
-        this.chooseAddr = '张三(18800001111) 河南省 郑州市 中原区 大学科技园'
-        this.addressVal = '更换地址'
-        this.openAddrModal = false
-      }
-    },
-    watch: {
-      //  父页面传过来的弹框状态
-      openModal (newValue, oldValue) {
-        this.isShow = newValue
+      rules: {
+        name: [
+          { required: true, message: '请输入仓库名称', trigger: 'blur' }
+        ]
       },
-      //  重定义的弹框状态
-      isShow (newValue, oldValue) {
-        if (!newValue) {
-          this.$emit('close')
-        }
+      addressVal: '选择地址', //  选择地址/更换地址
+      chooseAddr: '', //  当前已选地址信息
+      openAddrModal: false // 选择地址弹框是否显示
+    }
+  },
+  methods: {
+    //  保存
+    handleSave () {
+      this.isShow = false
+      this.$emit('ok')
+    },
+    //  选择地址
+    handleChoose () {
+      this.openAddrModal = true
+    },
+    //  地址保存
+    handleOk (data) {
+      this.chooseAddr = '张三(18800001111) 河南省 郑州市 中原区 大学科技园'
+      this.addressVal = '更换地址'
+      this.openAddrModal = false
+    }
+  },
+  watch: {
+    //  父页面传过来的弹框状态
+    openModal (newValue, oldValue) {
+      this.isShow = newValue
+    },
+    //  重定义的弹框状态
+    isShow (newValue, oldValue) {
+      if (!newValue) {
+        this.$emit('close')
       }
     }
   }
+}
 </script>
 
 <style lang="less">

+ 11 - 4
src/views/purchasingManagement/purchaseOrder/edit.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="purchaseOrderEdit-wrap">
-    <a-page-header :ghost="false" @back="handleBack" >
+    <a-page-header :ghost="false" @back="handleBack" class="purchaseOrderEdit-cont">
       <!-- 自定义的二级文字标题 -->
       <template slot="subTitle">
-        <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack">返回列表</a>
+        <a id="purchaseOrderEdit-back-btn" href="javascript:;" @click="handleBack" style="vertical-align: top;">返回列表</a>
+        <p class="billno">单号:CG2021010100001</p>
       </template>
       <!-- 操作区,位于 title 行的行尾 -->
       <template slot="extra">
@@ -11,8 +12,6 @@
         <a-button key="1" type="primary" id="purchaseOrderEdit-print-btn">快速打印</a-button>
       </template>
     </a-page-header>
-    <!-- 内容 -->
-    <a-page-header title="单号:CG2021010100001" ></a-page-header>
     <!-- 基础信息 -->
     <a-card size="small" :bordered="false" class="purchaseOrderEdit-cont">
       <a-collapse :activeKey="['1']">
@@ -328,6 +327,14 @@ export default {
 
 <style lang="less">
   .purchaseOrderEdit-wrap{
+    .billno{
+      margin: 0 0 0 60px;
+      font-size: 20px;
+      font-weight: 600;
+      display: inline-block;
+      vertical-align: top;
+      color: rgba(0, 0, 0, 0.85);
+    }
     .purchaseOrderEdit-cont{
       margin-bottom: 15px;
       .sub-title{

+ 23 - 11
src/views/purchasingManagement/purchaseOrder/list.vue

@@ -6,21 +6,27 @@
         <a-row :gutter="15">
           <a-col :md="6" :sm="24">
             <a-form-item label="创建时间">
-              <a-range-picker v-model="queryParam.creatDate" id="purchaseOrderList-creatDate"/>
+              <a-range-picker
+                style="width:100%"
+                id="purchaseOrderList-creatDate"
+                :disabledDate="disabledDate"
+                v-model="time"
+                :format="dateFormat"
+                :placeholder="['开始时间', '结束时间']" />
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="采购单号">
-              <a-input id="purchaseOrderList-purchaseNo" v-model.trim="queryParam.purchaseNo" allowClear placeholder="请输入采购单号"/>
+              <a-input id="purchaseOrderList-purchaseBillNo" v-model.trim="queryParam.purchaseBillNo" allowClear placeholder="请输入采购单号"/>
             </a-form-item>
           </a-col>
           <a-col :md="6" :sm="24">
             <a-form-item label="供应商" :label-col="{ span:7 }" :wrapper-col="{ span:17}">
               <a-select
-                id="purchaseOrderList-customeName"
+                id="purchaseOrderList-dealerName"
                 placeholder="请选择供应商"
                 allowClear
-                v-model="queryParam.dataSourceNo"
+                v-model="queryParam.dealerName"
                 :showSearch="true"
                 option-filter-prop="children"
                 :filter-option="filterOption">
@@ -32,9 +38,9 @@
             <a-col :md="6" :sm="24">
               <a-form-item label="单据状态">
                 <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="purchaseOrderList-billStatus"
+                  v-model="queryParam.auditStatus"
+                  ref="auditStatus"
+                  id="purchaseOrderList-auditStatus"
                   code="PAYMENT_TYPE"
                   placeholder="请选择单据状态"
                   allowClear></v-select>
@@ -43,9 +49,9 @@
             <a-col :md="6" :sm="24">
               <a-form-item label="结算状态">
                 <v-select
-                  v-model="queryParam.billStatus"
-                  ref="billStatus"
-                  id="purchaseOrderList-billStatus"
+                  v-model="queryParam.financialStatus"
+                  ref="financialStatus"
+                  id="purchaseOrderList-financialStatus"
                   code="PAYMENT_TYPE"
                   placeholder="请选择结算状态"
                   allowClear></v-select>
@@ -85,7 +91,7 @@
       bordered>
       <!-- 采购单号 -->
       <template slot="purchaseBillNo" slot-scope="text, record">
-        <span style="color: #ed1c24;cursor: pointer;">{{ record.purchaseBillNo }}</span>
+        <span style="color: #ed1c24;cursor: pointer;" @click="handleDetail(record)">{{ record.purchaseBillNo }}</span>
       </template>
       <!-- 业务/审核状态 -->
       <template slot="auditStatus" slot-scope="text, record">
@@ -125,6 +131,8 @@ export default {
       disabled: false, //  查询、重置按钮是否可操作
       openModal: false, // 基本信息弹框是否显示
       customeList: [],
+      dateFormat: 'YYYY-MM-DD',
+      time: [], //  创建时间
       // 查询参数
       queryParam: {},
       // 表头
@@ -156,6 +164,10 @@ export default {
     }
   },
   methods: {
+    // 不可选日期
+    disabledDate (date, dateStrings) {
+      return date && date.valueOf() > Date.now()
+    },
     //  新增
     handleAdd () {
       this.openModal = true

+ 2 - 2
src/views/salesManagement/salesQuery/chooseCustomModal.vue

@@ -281,8 +281,8 @@ export default {
     handleSubmit (e) {
       e.preventDefault()
       const _this = this
-      // this.$emit('ok', { id: 1000, customName: '车领主常青二路店' })
-      // this.cancel()
+      this.$emit('ok', { id: 1000, customName: '车领主常青二路店' })
+      this.cancel()
       this.$refs.ruleForm.validate(valid => {
         if (valid) {
           console.log('-------------提交信息', _this.form)