Merge branch 'feature/Feature-home' into develop

src/styles/element-ui.scss

@@ -55,6 +55,9 @@
   .el-form-item__content {
     line-height: 0 !important;
   }
+  .el-range-editor--mini .el-range-separator {
+    line-height: 28px !important;
+  }
 }
 // dropdown
 .el-dropdown-menu {

src/views/basic_data/stock/stock_fee_list.vue

@@ -101,6 +101,47 @@
                   <el-input v-model="screenForm.specification" placeholder="请输入规格型号" />
                 </el-form-item>
               </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="审核日期" prop="approvalDate">
+                  <el-date-picker
+                    v-model="screenForm.approvalDate"
+                    type="datetimerange"
+                    range-separator="至"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="状态" prop="saleExamineStatus">
+                  <el-select v-model="screenForm.saleExamineStatus" clearable filterable>
+                    <el-option
+                      v-for="(item, index) in statusList"
+                      :key="index"
+                      :label="item.label"
+                      :value="item.value"
+                    />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="出库日期" prop="saleDate">
+                  <el-date-picker
+                    v-model="screenForm.saleDate"
+                    type="datetimerange"
+                    range-separator="至"
+                    style="width: 100%"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    start-placeholder="开始日期"
+                    end-placeholder="结束日期"
+                  >
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
             </el-row>
           </el-form>
         </template>
@@ -227,9 +268,19 @@ export default {
         specification: '',
         startTime: '',
         orderDate: [],
-        invoiceDate: []
+        invoiceDate: [],
+        approvalDate: [],
+        saleDate: [],
+        saleExamineStatus: ''
       },
       typeList: [],
+      statusList: [
+        { value: 'SAVE', label: '保存' },
+        { value: 'WAIT', label: '待审核' },
+        { value: 'OK', label: '通过' },
+        { value: 'FAIL', label: '不通过' },
+        { value: 'CLOSE', label: '关闭' }
+      ],
       warehouseList: [],
       categoryList: [],
       isCollapse: true,
@@ -319,6 +370,11 @@ export default {
         id: this.screenForm.id,
         invoiceEndTime: this.screenForm.invoiceDate[1],
         invoiceStartTime: this.screenForm.invoiceDate[0],
+        approvalStartTime: this.screenForm.approvalDate[0],
+        approvalEndTime: this.screenForm.approvalDate[1],
+        saleStartTime: this.screenForm.saleDate[0],
+        saleEndTime: this.screenForm.saleDate[1],
+        saleExamineStatus: this.screenForm.saleExamineStatus,
         mainOrderId: this.screenForm.mainOrderId,
         materialName: this.screenForm.materialName,
         materialNumber: this.screenForm.materialNumber,
@@ -330,12 +386,16 @@ export default {
     },
     filterOderType() {
       return type => {
-        return this.orderType.find(e => e.value === type).label
+        if (this.orderType.length && type) {
+          return this.orderType.find(e => e.value === type).label
+        }
       }
     },
     filterExamineStatus() {
       return status => {
-        return this.examineStatus.find(e => e.value === status).label
+        if (this.examineStatus.length && status) {
+          return this.examineStatus.find(e => e.value === status).label
+        }
       }
     }
   },
@@ -361,7 +421,12 @@ export default {
         orderNo: this.screenForm.orderNo,
         orderType: this.screenForm.orderType,
         specification: this.screenForm.specification,
-        startTime: this.screenForm.orderDate[0]
+        startTime: this.screenForm.orderDate[0],
+        approvalStartTime: this.screenForm.approvalDate[0],
+        approvalEndTime: this.screenForm.approvalDate[1],
+        saleStartTime: this.screenForm.saleDate[0],
+        saleEndTime: this.screenForm.saleDate[1],
+        saleExamineStatus: this.screenForm.saleExamineStatus
       }
       this.listLoading = true
       getListStorageFee(params).then(res => {

src/views/finance/receivable_list.vue

@@ -68,6 +68,11 @@
                     </el-date-picker>
                   </el-form-item>
                 </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="审核人" prop="confirmName">
+                    <el-input v-model="searchForm.confirmName" placeholder="请输入审核人" />
+                  </el-form-item>
+                </el-col>
               </el-row>
             </el-form>
           </template>
@@ -276,7 +281,8 @@ export default {
         code: '',
         userName: '',
         startTime: '',
-        endTime: ''
+        endTime: '',
+        confirmName: ''
       }, //搜索表单
       listLoading: false, // 列表加载loading
       examine: '',
@@ -295,7 +301,8 @@ export default {
         userName: this.searchForm.userName,
         startTime: this.searchForm.startTime,
         endTime: this.searchForm.endTime,
-        examineStatus: this.examine
+        examineStatus: this.examine,
+        confirmName: this.searchForm.confirmName
       }
     }
   },

src/views/supply/engin/commerce_list.vue

@@ -501,6 +501,7 @@ import CommerceForm from '@/views/supply/engin/components/commerce_form'
 import CommerceExamine from '@/views/supply/engin/components/commerce_examine'
 import CommerceReturn from '@/views/supply/engin/components/commerce_return'
 import EditDateDialog from '@/components/Common/edit-date-dialog'
+import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
@@ -567,7 +568,8 @@ export default {
       isShowForm: false,
       isShowExamine: false,
       isShowReturn: false,
-
+      typeList: [],
+      NoRebateWalletList: [],
       editId: null,
       isShowEditDateDialog: false,
       dateForm: {
@@ -623,6 +625,16 @@ export default {
       }).then(res => {
         this.salesmanList = res.data.records
       })
+      getNoRebateWalletList({
+        walletName: ''
+      }).then(res => {
+        console.log(res)
+        this.NoRebateWalletList = res.data
+      })
+      getTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
+        this.typeList = res.data.records
+        console.log(this.typeList)
+      })
     },
 
     // 获取销售类型列表
@@ -793,6 +805,7 @@ export default {
     // 提交 修改订单日期
     submitDateForm() {
       editDateCom({
+        refEnginRecordNo: this.screenForm.loginNum,
         enginOrderId: this.editId,
         orderDate: this.dateForm.date + ' 00:00:00'
       }).then(res => {

src/views/supply/engin/engin_list.vue

@@ -447,11 +447,12 @@
 
 <script>
 import { getEnginList, applyEngin, withdrawEngin, deleteEngin, editDateEngin, abandonEngin } from '@/api/supply/engin'
-import { getSalesmanList } from '@/api/common'
+import { getSalesmanList, getTypeList } from '@/api/common'
 import EnginDetail from '@/views/supply/engin/components/engin_detail'
 import EnginForm from '@/views/supply/engin/components/engin_form'
 import EnginExamine from '@/views/supply/engin/components/engin_examine'
 import EditDateDialog from '@/components/Common/edit-date-dialog'
+import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
@@ -509,6 +510,8 @@ export default {
       isShowExamine: false,
       isCollapse: true,
       editId: null,
+      NoRebateWalletList: [],
+      typeList: [],
       isShowEditDateDialog: false,
       dateForm: {
         date: ''
@@ -576,6 +579,16 @@ export default {
       }).then(res => {
         this.salesmanList = res.data.records
       })
+      getNoRebateWalletList({
+        walletName: ''
+      }).then(res => {
+        console.log(res)
+        this.NoRebateWalletList = res.data
+      })
+      getTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
+        this.typeList = res.data.records
+        console.log(this.typeList)
+      })
     },
 
     // 查询列表

src/views/supply/engin/home_list.vue

@@ -574,6 +574,7 @@ import HomeForm from '@/views/supply/engin/components/home_form'
 import HomeExamine from '@/views/supply/engin/components/home_examine'
 import HomeReturn from '@/views/supply/engin/components/home_return'
 import EditDateDialog from '@/components/Common/edit-date-dialog'
+import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
@@ -655,7 +656,9 @@ export default {
         date: ''
       },
       isCollapse: true,
-      salesTypeList: []
+      salesTypeList: [],
+      NoRebateWalletList: [],
+      typeList: []
     }
   },
 
@@ -719,6 +722,16 @@ export default {
       }).then(res => {
         this.salesmanList = res.data.records
       })
+      getNoRebateWalletList({
+        walletName: ''
+      }).then(res => {
+        console.log(res)
+        this.NoRebateWalletList = res.data
+      })
+      getTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
+        this.typeList = res.data.records
+        console.log(this.typeList)
+      })
     },
 
     // 获取销售类型列表
@@ -903,6 +916,7 @@ export default {
     // 提交 修改订单日期
     submitDateForm() {
       editDateHome({
+        refEnginRecordNo: this.screenForm.loginNum,
         enginOrderId: this.editId,
         orderDate: this.dateForm.date + ' 00:00:00'
       }).then(res => {

src/views/supply/implement/implement_list.vue

@@ -396,6 +396,13 @@
                 <span>{{ scope.row.policyCode }}</span>
               </template>
             </el-table-column>
+            <el-table-column
+              align="left"
+              label="所属集团"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
           </el-table>
         </div>
       </div>

src/views/supply/implement/implement_total_list.vue

@@ -407,6 +407,13 @@
                 <span>{{ scope.row.policyCode }}</span>
               </template>
             </el-table-column>
+            <el-table-column
+              align="left"
+              label="所属集团"
+              prop=""
+              min-width="160"
+              show-overflow-tooltip
+            ></el-table-column>
           </el-table>
         </div>
       </div>

src/views/supply/policy/policy_list.vue

@@ -498,7 +498,8 @@ import RetailExamine from './components/retail_examine'
 import RetailReturn from './components/retail_return'
 import EditDateDialog from '@/components/Common/edit-date-dialog'
 import ExamineDialog from '@/components/Common/examine-dialog'
-import { getSalesmanList, getCategoryList } from '@/api/common'
+import { getSalesmanList, getCategoryList, getTypeList } from '@/api/common'
+import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
@@ -568,7 +569,9 @@ export default {
         remark: ''
       },
       categoryList: [],
-      isCollapse: true
+      isCollapse: true,
+      NoRebateWalletList: [],
+      typeList: []
     }
   },
   computed: {
@@ -627,6 +630,16 @@ export default {
       }).then(res => {
         this.salesmanList = res.data.records
       })
+      getNoRebateWalletList({
+        walletName: ''
+      }).then(res => {
+        console.log(res)
+        this.NoRebateWalletList = res.data
+      })
+      getTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
+        this.typeList = res.data.records
+        console.log(this.typeList)
+      })
     },
     handleSelectionAllChange(e) {
       this.selectData = e

src/views/supply/retail/retail_list.vue

@@ -527,12 +527,13 @@
 
 <script>
 import { getList, closeData, submitData, editData, abandonData, deleteData, withdrawData } from '@/api/supply/retail'
-import { getSalesmanList } from '@/api/common'
+import { getSalesmanList, getTypeList } from '@/api/common'
 import RetailDetail from '@/views/supply/retail/components/retail_detail'
 import RetailForm from '@/views/supply/retail/components/retail_form'
 import RetailExamine from '@/views/supply/retail/components/retail_examine'
 import RetailReturn from '@/views/supply/retail/components/retail_return'
 import EditDateDialog from '@/components/Common/edit-date-dialog'
+import { getNoRebateWalletList } from '@/api/policy_list'
 
 let that
 export default {
@@ -578,7 +579,8 @@ export default {
         // { label: "已关闭", value: "CLOSE" },
       ],
       salesmanList: [],
-
+      NoRebateWalletList: [],
+      typeList: [],
       queryItem: {},
       isShowDetail: false,
       isShowForm: false,
@@ -634,6 +636,16 @@ export default {
       }).then(res => {
         this.salesmanList = res.data.records
       })
+      getNoRebateWalletList({
+        walletName: ''
+      }).then(res => {
+        console.log(res)
+        this.NoRebateWalletList = res.data
+      })
+      getTypeList({ pageNum: 1, pageSize: -1 }).then(res => {
+        this.typeList = res.data.records
+        console.log(this.typeList)
+      })
     },
 
     // 查询列表

src/views/supply/sales/components/sales_detail.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="detail-container">
-    <el-page-header @back="goBack" content="详情"></el-page-header>
+    <el-page-header @back="goBack" :content="!edit ? '详情' : '编辑'"></el-page-header>
 
     <div id="printMe">
       <div class="main-title">
@@ -36,7 +36,9 @@
           </el-col>
           <el-col :span="16" class="item">
             <div class="label">备注</div>
-            <div class="value">{{ detailData.remark }}</div>
+            <div class="value">
+              <el-input v-model="detailData.remark" :readonly="!edit" placeholder="请输入备注"></el-input>
+            </div>
           </el-col>
         </el-row>
       </div>