Merge branch 'master_bug' into bug1

src/api/sales.js

@@ -3,7 +3,7 @@ import request, { postBlob } from '@/utils/request'
 // 客户销售单
 export function getFrontOrderList(params) {
   return request({
-    url: '/customer/frontOrder/list',
+    url: `/customer/frontOrder/list?moduleId=${params.moduleId}`,
     method: 'post',
     data: params
   })
@@ -21,7 +21,7 @@ export function exportCustomerFrontOrder(data, name) {
 // 客户销售单
 export function getFrontOrderListRefund(params) {
   return request({
-    url: '/customer/frontOrder/listRefund',
+    url: `/customer/frontOrder/listRefund?moduleId=${params.moduleId}`,
     method: 'post',
     data: params
   })

src/api/stock.js

@@ -1,4 +1,4 @@
-import request, { postBlob } from '@/utils/request'
+import request, { postBlob, handleImport, getBlob } from '@/utils/request'
 
 // 获取库存列表
 export function getStockList(params) {
@@ -84,7 +84,7 @@ export function getNoticeNum(params) {
 // 经销商仓库库存列表(前置)
 export function getcustomerFrontList(params) {
   return request({
-    url: '/customer/front/list',
+    url: `/customer/front/list?moduleId=${params.moduleId}`,
     method: 'post',
     data: params
   })
@@ -102,7 +102,7 @@ export function partsNewInExport(data, name) {
 // 经销商仓库库存列表(商家)
 export function getFrontListCustomer(params) {
   return request({
-    url: '/customer/front/listCustomer',
+    url: `/customer/front/listCustomer?moduleId=${params.moduleId}`,
     method: 'post',
     data: params
   })
@@ -120,8 +120,9 @@ export function exportCustomer(data, name) {
 
 // 库存调整管理
 export function getFrontListCustomerAcc(params) {
+  console.log(params);
   return request({
-    url: '/customer/front/listCustomerAcc',
+    url: `/customer/front/listCustomerAcc?moduleId=${params.moduleId}`,
     method: 'post',
     data: params
   })
@@ -139,7 +140,7 @@ export function exportCustomerStockOrderBean(data, name) {
 // 库存调整管理三级帐
 export function getFrontListStockAcc(params) {
   return request({
-    url: '/customer/front/listStockAcc',
+    url: `/customer/front/listStockAcc?moduleId=${params.moduleId}`,
     method: 'post',
     data: params
   })
@@ -189,3 +190,17 @@ export function deleteCustomerStockOrder(params) {
     data: params
   })
 }
+
+// 导入
+export function partsNewInImport(data) {
+  return handleImport("/customer/front/importData", data.formdata, data.id || "");
+}
+
+// 下载模板
+export function workerTemplateExcel(data, name) {
+  return getBlob({
+    url: "/customer/front/download",
+    data,
+    name
+  });
+}

src/components/SalesHeader/SalesHeader.vue

@@ -22,7 +22,7 @@
             <el-date-picker
               style="width: 100%"
               v-model="screenForm.pickTime"
-              type="datetime"
+              type="date"
               size="mini"
               value-format="yyyy-MM-dd HH:mm:ss"
               placeholder="选择日期"
@@ -157,8 +157,10 @@ export default {
           required: true, message: '请输入用户名称', trigger: 'change'
         }],
         phone: [{
-          required: true, message: '请输入用户电话', trigger: 'change'
-        }],
+          required: true, message: '请输入用户电话', trigger: 'change',
+        },
+        { min: 11, max: 11, message: '请输入11位手机号', trigger: 'change' }
+      ],
         receAddress: [{
           required: true, message: '请输入送货地址', trigger: 'change'
         }]

src/components/WarehousingHeader/WarehousingHeader.vue

@@ -1,12 +1,6 @@
 <template>
   <div class="warehousing">
-    <el-form
-      v-if="pageType==='add'"
-      label-position="left"
-      label-width="120px"
-      :model="screenForm"
-      size="mini"
-    >
+    <el-form v-if="pageType === 'add'" label-position="left" label-width="120px" :model="screenForm" size="mini">
       <el-row :gutter="20">
         <el-col :xs="24" :ms="8" :lg="8">
           <el-form-item label="商家编号" prop="customerNumber">
@@ -18,15 +12,10 @@
             <el-input disabled v-model="screenForm.customerName" placeholder="商家名称" size="mini" />
           </el-form-item>
         </el-col>
-        <el-col :xs="24" :ms="8" :lg="8" >
+        <el-col :xs="24" :ms="8" :lg="8">
           <el-form-item label="调整日期" prop="changeTime">
-            <el-date-picker
-              disabled
-              v-model="screenForm.changeTime"
-              type="datetime"
-              size="mini"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择日期" />
+            <el-date-picker disabled v-model="screenForm.changeTime" type="datetime" size="mini"
+              value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" :default-value="new Date()"/>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :ms="8" :lg="8">
@@ -36,13 +25,8 @@
         </el-col>
         <el-col :xs="24" :ms="8" :lg="8">
           <el-form-item label="制单时间" prop="createTime">
-            <el-date-picker
-              disabled
-              v-model="screenForm.createTime"
-              type="datetime"
-              size="mini"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              placeholder="选择日期" />
+            <el-date-picker disabled v-model="screenForm.createTime" type="datetime" size="mini" 
+              value-format="yyyy-MM-dd HH:mm:ss" :default-value="new Date()" placeholder="选择日期" />
           </el-form-item>
         </el-col>
         <el-col :xs="24" :ms="24" :lg="24">
@@ -92,6 +76,7 @@
 </template>
 
 <script>
+import { dateFormat } from '@/utils/util';
 export default {
   name: 'WarehousingHeader',
   props: {
@@ -109,9 +94,9 @@ export default {
   data() {
     return {
       screenForm: {
-        changeTime: '',
+        changeTime: '' || this.nowDate(),
         createBy: JSON.parse(localStorage.getItem('supply_user')).nickName || '',
-        createTime:'',
+        createTime: ''|| this.nowDate(),
         customerName: '',
         customerNumber: '',
         remark: ''
@@ -134,6 +119,23 @@ export default {
         ]
       }
     }
+  },
+  created() {
+    this.nowDate()
+  },
+  methods: {
+    // 获取当前时间
+    nowDate() {
+      var dt = new Date(),               // 获取时间
+        Y = dt.getFullYear(),            //获取 年 (四位)
+        Mont = dt.getMonth() + 1,      //获取 月 (0-11,0代表1月)
+        Day = dt.getDate(),               //获取 日 （1-31）
+        Hous = dt.getHours(),         //获取 小时 (0-23)
+        Min = dt.getMinutes(),          //获取 分(0-59)
+        Sec = dt.getSeconds();       //获取秒 (0-59)
+      return `${Y}-${Mont}-${Day} ${Hous}:${Min}:${Sec}`
+
+    },
   }
 }
 </script>

src/components/template/import_mixin.js

@@ -2,6 +2,7 @@ export default {
   methods: {
     // 导入按钮
     importButton(func, name = '导入') {
+      console.log(333);
       return () => {
         return (
           <el-upload

src/layout/components/TagsView/index.vue

@@ -126,14 +126,20 @@ export default {
       })
     },
     refreshSelectedTag(view) {
-      this.$store.dispatch('tagsView/delCachedView', view).then(() => {
+      if (window.location) {
+        window.location.reload()
+      }else{
+        this.$store.dispatch('tagsView/delCachedView', view).then(() => {
         const { fullPath } = view
         this.$nextTick(() => {
           this.$router.replace({
-            path: '/redirect' + fullPath
+            path: fullPath,
+            redirect:'/'
           })
         })
       })
+      }
+     
     },
     closeSelectedTag(view) {
       this.$store.dispatch('tagsView/delView', view).then(({ visitedViews }) => {

src/views/deposit_home/refund_list.vue

@@ -21,7 +21,7 @@
             <el-form ref="screenForm" :model="screenForm" label-width="140px" size="mini" label-position="left">
               <el-row :gutter="20">
                 <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="工程信息单号" prop="refEnginRecordNo">
+                  <el-form-item label="工程登录编号" prop="refEnginRecordNo">
                     <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
                   </el-form-item>
                 </el-col>
@@ -338,7 +338,7 @@
             <el-table-column align="right" label="金额" prop="hasSendQty" min-width="100" show-overflow-tooltip />
             <el-table-column
               align="left"
-              label="工程信息单号"
+              label="工程登录编号"
               prop="refEnginRecordNo"
               min-width="160"
               show-overflow-tooltip

src/views/sales_control/components/WarehouseDetails.vue

@@ -77,7 +77,7 @@ export default {
           width: '180',
         },
         {
-          prop: 'remark',
+          prop: 'notes',
           label: '备注',
 
 

src/views/sales_control/components/WarehouseExamine.vue

@@ -97,7 +97,7 @@ export default {
           width: '180',
         },
         {
-          prop: 'remark',
+          prop: 'notes',
           label: '备注',
 
 

src/views/sales_control/components/WarehouseForm.vue

@@ -95,7 +95,7 @@ export default {
           isInput: true
         },
         {
-          prop: 'remark',
+          prop: 'notes',
           label: '备注',
           width: '180',
           isInput: true,

src/views/sales_control/preposition_stock_list.vue

@@ -7,6 +7,7 @@
       :getList="getList"
       :exportList="exportList"
       :columnParsing="columnParsing"
+      :optionsEvensGroup="optionsEvensGroup"
     >
     </template-page>
   </div>
@@ -16,7 +17,7 @@
 import TemplatePage from '@/components/template/template-page-1.vue'
 import import_mixin from '@/components/template/import_mixin.js'
 
-import { getcustomerFrontList, partsNewInExport } from '@/api/stock'
+import { getcustomerFrontList, partsNewInExport,partsNewInImport, workerTemplateExcel } from '@/api/stock'
 export default {
   components: { TemplatePage },
   mixins: [import_mixin],
@@ -24,15 +25,36 @@ export default {
     return {
       // 事件组合
       optionsEvensGroup: [
-        // [
-        //   [
-        //     {
-        //       name: '批量删除',
-        //       click: this.dels,
-        //       isRole: this.$checkBtnRole('del', this.$route.meta.roles)
-        //     }
-        //   ]
-        // ]
+      [
+          [
+          {
+              name: "下载模板",
+              click: () => {
+                workerTemplateExcel({}, `${this.$route.meta.title}_template`)
+                  .then(res => {
+                    this.$message({
+                      message: "下载成功",
+                      type: "success"
+                    });
+                  })
+                  .catch(err => {
+                    this.$message.error("下载失败");
+                  });
+              },
+              isRole: this.$checkBtnRole("import")
+            }
+          ]
+        ],
+        [
+          [
+            {
+              name: '',
+              render:this.importButton(partsNewInImport),
+              isRole: this.$checkBtnRole("import")
+            }
+          ]
+        ]
+       
       ],
       // 表格属性
       tableAttributes: {

src/views/sales_control/sales_management/components/return_sales_form.vue

@@ -261,23 +261,25 @@ export default {
 
     handelSubmit(type, status = 1) {
 
-      if (!this.dataList.length) {
+      const list  = JSON.parse(JSON.stringify(this.dataList))
+
+      if (!list.length) {
         this.$errorMsg('请添加产品')
         return
       }
-      for (let i = 0; i < this.dataList.length; i++) {
+      for (let i = 0; i < list.length; i++) {
 
-        this.dataList[i].directFlag = this.dataList[i].flag
-        if (Number(this.dataList[i].qty) < 0 || !this.dataList[i].qty) {
+        list[i].directFlag = list[i].flag
+        if (Number(list[i].qty) < 0 || !list[i].qty) {
           this.$errorMsg(`第${i + 1}产品退货数量有误`)
           return
         }
-        // this.dataList[i].id = ''
+        list[i].id = ''
       }
 
       const params = {
         ...this.$refs.header.details,
-        orders: this.dataList,
+        orders: list,
         customerOrderNo: this.details.customerOrderNo,
         status
       }