Merge remote-tracking branch 'origin/master'

src/api/common.js

@@ -105,3 +105,12 @@ export function getSalesmanList(params) {
     params,
   });
 }
+
+// 更新发票
+export function updateReceipt(params) {
+  return request({
+    url: '/stock/manager/receipt',
+    method: 'get',
+     params
+  })
+}

src/api/supply/implement.js

@@ -16,4 +16,14 @@ export function getDetail(params) {
     method: 'get',
     params
   })
-}
+}
+
+// 获取列表
+export function getTotalList(params) {
+  return request({
+    url: '/retail/exec/list/total',
+    method: 'get',
+    params
+  })
+}
+

src/api/supply/sales.js

@@ -93,10 +93,13 @@ export function addReturn(params) {
 
 
 
-export function updateReceipt(params) {
+
+
+export function updateNum(params) {
   return request({
-    url: '/stock/manager/receipt',
-    method: 'get',
-     params
+    url: '/saleRetreat/order/update',
+    method: 'post',
+    data :params
   })
 }
+

src/layout/components/Sidebar/SidebarItem.vue

@@ -90,6 +90,7 @@ export default {
       return false
     },
     resolvePath(routePath) {
+
       if (isExternal(routePath)) {
         return routePath
       }

src/layout/components/Sidebar/index.vue

@@ -37,15 +37,16 @@ export default {
       return this.$router.options.routes.concat(global.antRouter) //把路由concat进去
     },
     activeMenu() {
+      console.log(444);
       const route = this.$route
-      console.log(route);
+
       const { meta, path ,fullUrl} = route
-      console.log(fullUrl,'kllk',this.routes);
+          console.log(route);
       // if set path, the sidebar will highlight the path you set
       if (meta.activeMenu) {
         return meta.activeMenu
       }
-      return fullUrl
+      return path
     },
     showLogo() {
       return this.$store.state.settings.sidebarLogo

src/layout/components/TagsView/index.vue

@@ -69,6 +69,7 @@ export default {
   },
   methods: {
     isActive(route) {
+
       return route.path === this.$route.path
     },
     isAffix(tag) {
@@ -158,6 +159,7 @@ export default {
       })
     },
     toLastView(visitedViews, view) {
+      console.log(1111);
       const latestView = visitedViews.slice(-1)[0]
       if (latestView) {
         this.$router.push(latestView.fullPath)

src/views/deposit_commerce/deposit_list.vue

@@ -11,7 +11,7 @@
         <el-form
           ref="screenForm"
           :model="screenForm"
-          label-width="120px"
+          label-width="140px"
           size="mini"
           label-position="left"
         >
@@ -58,6 +58,7 @@
                 <el-date-picker
                   v-model="screenForm.startSubmitTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -68,6 +69,7 @@
                 <el-date-picker
                   v-model="screenForm.endSubmitTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -78,6 +80,7 @@
                 <el-date-picker
                   v-model="screenForm.startConfirmTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -88,6 +91,7 @@
                 <el-date-picker
                   v-model="screenForm.endConfirmTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -95,8 +99,8 @@
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
-              <el-option  label="默认" :value="null"></el-option>
+              <el-select style="width:100%" v-model="screenForm.isRefundDeposit" clearable  placeholder="请选择是否退押 " >
+
 
                 <el-option v-for="item in refundDepositArr"
                   :key="item.value"
@@ -108,8 +112,7 @@
             </el-col>
    <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-              <el-select style="width:100%" v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
-              <el-option  label="默认" :value="null"></el-option>
+              <el-select style="width:100%" v-model="screenForm.examineStatus"  clearable  placeholder="请选择状态 " >
 
                 <el-option v-for="item in examineStatusArr"
                   :key="item.value"
@@ -154,6 +157,7 @@
                           <el-date-picker
                   v-model="screenForm.startInstallTime"
                   class="dateStyle"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   type="datetime"
                   placeholder="选择日期"
                 />
@@ -165,6 +169,7 @@
                   v-model="screenForm.endInstallTime"
                   class="dateStyle"
                   type="datetime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   placeholder="选择日期"
                 />
 
@@ -192,7 +197,41 @@
                 </el-form-item>
 
               </el-col>
+  <el-col :xs="24" :sm="12" :lg="6">
+               <el-form-item label="格力内部备注" prop="geLiInerNote">
+
+                        <el-input  v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注" ></el-input>
+
+                </el-form-item>
 
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="厂编号" prop="factoryNo">
+                  <el-input  v-model="screenForm.factoryNo" placeholder="请输入厂编号" ></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="资料审核开始日期" prop="startAcceptTime">
+                <el-date-picker
+                  v-model="screenForm.startAcceptTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="资料审核结束日期" prop="endAcceptTime">
+                <el-date-picker
+                  v-model="screenForm.endAcceptTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+            </el-col>
 
               </template>
             <el-col :xs="24" :sm="24" :lg="24">
@@ -502,6 +541,9 @@ export default {
         specialNo:'',
         refRegionWork:'',
         endSubmitTime:''
+        ,
+        startAcceptTime:'',    endAcceptTime:'',
+        geLiInerNote:'',factoryNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -575,7 +617,9 @@ export default {
         ...this.screenForm
       }
       params.isRefundDeposit = this.deduction === '已退押' ? true : ''
-
+   if (this.screenForm.isRefundDeposit == true || this.screenForm.isRefundDeposit == false ) {
+      params.isRefundDeposit =this.screenForm.isRefundDeposit
+    }
       getList(params).then((res) => {
         this.dataList = res.data.records
         res.data.records.forEach((item) => {

src/views/deposit_commerce/refund_list.vue

@@ -11,28 +11,16 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form
-          ref="screenForm"
-          :model="screenForm"
-          label-width="120px"
-          size="mini"
-          label-position="left"
-        >
+        <el-form ref="screenForm" :model="screenForm" label-width="120px" size="mini" label-position="left">
           <el-row :gutter="20">
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="工程登录编号" prop="refEnginRecordNo">
-                <el-input
-                  v-model="screenForm.refEnginRecordNo"
-                  placeholder="请输入"
-                />
+                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商编码/名称" prop="customerKeyword">
-                <el-input
-                  v-model="screenForm.customerKeyword"
-                  placeholder="请输入"
-                />
+                <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -43,75 +31,43 @@
                 ></el-input>
               </el-form-item>
             </el-col> -->
-               <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="行业类别" prop="refTradeCategory">
                 <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input
-                  v-model="screenForm.refUseUnit"
-                  placeholder="请输入"
-                />
+                <el-input v-model="screenForm.refUseUnit" placeholder="请输入" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始申请日期" prop="startSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.startSubmitTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="screenForm.startSubmitTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
             </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束申请日期" prop="endSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.endSubmitTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="screenForm.endSubmitTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
             </el-col>
 
-
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-                <el-select
-                  style="width: 100%"
-                  v-model="screenForm.isRefundDeposit"
-                  placeholder="请选择是否退押 "
-                >
+                <el-select style="width: 100%" v-model="screenForm.isRefundDeposit" placeholder="请选择是否退押 ">
                   <el-option label="默认" :value="null"></el-option>
 
-                  <el-option
-                    v-for="item in refundDepositArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                  <el-option v-for="item in refundDepositArr" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-                <el-select
-                  style="width: 100%"
-                  v-model="screenForm.examineStatus"
-                  placeholder="请选择状态 "
-                >
+                <el-select style="width: 100%" v-model="screenForm.examineStatus" placeholder="请选择状态 ">
                   <el-option label="默认" :value="null"></el-option>
 
-                  <el-option
-                    v-for="item in examineStatusArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                  <el-option v-for="item in examineStatusArr" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -126,88 +82,86 @@
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col> -->
-             <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始受理日期" prop="startConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.startConfirmTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="screenForm.startConfirmTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束受理日期" prop="endConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.endConfirmTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="screenForm.endConfirmTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
             </el-col>
             <template v-if="!isCustomer">
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="审核人" prop="confirmName">
-                  <el-input
-                    v-model="screenForm.confirmName"
-                    placeholder="请输入审核人"
-                  />
+                  <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="区域" prop="refRegionWork">
-                  <el-input
-                    v-model="screenForm.refRegionWork"
-                    placeholder="请输入区域"
-                  />
+                  <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
                 </el-form-item>
               </el-col>
-                 <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期"   style="margin-bottom:0">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="安装日期" style="margin-bottom:0">
                   <div class="fanwei">
-                     <el-form-item prop="startInstallTime">
-                          <el-date-picker
-                        v-model="screenForm.startInstallTime"
-                        class="dateStyle"
-                        type="datetime"
-                        placeholder="选择日期"
-                      />
+                    <el-form-item prop="startInstallTime">
+                      <el-date-picker v-model="screenForm.startInstallTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
 
-                     </el-form-item>
-                      <span>-</span>
+                    </el-form-item>
+                    <span>-</span>
                     <el-form-item prop="endInstallTime">
-                                 <el-date-picker
-                  v-model="screenForm.endInstallTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                      <el-date-picker v-model="screenForm.endInstallTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
 
-                     </el-form-item>
+                    </el-form-item>
                   </div>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="规格型号" prop="specification">
-                        <el-input  v-model="screenForm.specification" ></el-input>
+                  <el-input v-model="screenForm.specification"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="特价编号" prop="specialNo">
+
+                  <el-input v-model="screenForm.specialNo"></el-input>
+
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="特价编号" prop="specialNo">
+                <el-form-item label="跨区厂编号" prop="refFactoryNo">
 
-                        <el-input  v-model="screenForm.specialNo" ></el-input>
+                  <el-input v-model="screenForm.refFactoryNo"></el-input>
 
                 </el-form-item>
+
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="跨区厂编号" prop="refFactoryNo">
+                <el-form-item label="格力内部备注" prop="refFactoryNo">
+
+                  <el-input v-model="screenForm.refFactoryNo"></el-input>
 
-                        <el-input  v-model="screenForm.refFactoryNo" ></el-input>
+                </el-form-item>
 
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="厂编号" prop="factoryNo">
+                  <el-input v-model="screenForm.factoryNo"></el-input>
                 </el-form-item>
 
               </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="资料审核开始日期" prop="startAcceptTime">
+                  <el-date-picker v-model="screenForm.startAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="资料审核结束日期" prop="endAcceptTime">
+                  <el-date-picker v-model="screenForm.endAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
               <!-- <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="产品编码" >
                   <div class="fanwei">
@@ -228,15 +182,15 @@
 
             </template>
             <el-col :xs="24" :sm="24" :lg="24">
-             <div class="fl">
-          <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+              <div class="fl">
+                <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
             <el-radio-button label="HOME">家用工程</el-radio-button>
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group> -->
-          <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
-        </div>
+                <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
+              </div>
               <el-form-item label="" class="fr">
-                     <el-button size="mini" @click="resetFn">清空</el-button>
+                <el-button size="mini" @click="resetFn">清空</el-button>
                 <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
@@ -280,13 +234,13 @@
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
-              <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
                 <span>{{scope.row.customerNumber}}</span>
               </template>
             </el-table-column>
-             <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
@@ -298,9 +252,9 @@
                 <span>{{scope.row.refFactoryNo}}</span>
               </template>
             </el-table-column>
-             <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-              <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="left" label="项目类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -316,7 +270,6 @@
               </template>
             </el-table-column>
 
-
             <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refRegionWork" />
@@ -324,13 +277,13 @@
               </template>
             </el-table-column>
 
-                 <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialNumber" />
                 <span>{{scope.row.materialNumber}}</span>
               </template>
             </el-table-column>
-              <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
                 <span>{{scope.row.materialOldNumber}}</span>
@@ -357,7 +310,6 @@
             <!-- <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column> -->
 
-
             <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="160" show-overflow-tooltip>
@@ -414,7 +366,7 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
-        screenForm: {
+      screenForm: {
         confirmName: "", // 审核人
         createName: "", // 创建人
         customerKeyword: "", // 客户编码/客户名称
@@ -432,15 +384,19 @@ export default {
         startInstallTime: "",
         endConfirmTime: "",
         endInstallTime: "",
-        specification:'',
-        refFactoryNo:'',
+        specification: "",
+        refFactoryNo: "",
         factoryNo: "",
         specialNo: "",
         refRegionWork: "",
-        endSubmitTime:'',
-        refTradeCategory:''
+        endSubmitTime: "",
+        refTradeCategory: "",
+        refFactoryNo: "",
+        factoryNo: "",
+        startAcceptTime: "",
+        endAcceptTime: "",
       }, // 搜索表单
-       refundDepositArr: [
+      refundDepositArr: [
         {
           label: "是",
           value: true,
@@ -485,11 +441,11 @@ export default {
       pageSize: this.pageSize,
       pageNum: this.currentPage,
       enginOrderType: this.enginOrderType,
-       ...this.screenForm,
+      ...this.screenForm,
       // startDeliverTime: "",
     });
   },
-   computed: {
+  computed: {
     isCustomer() {
       return (
         this.$store.getters.customerId && this.$store.getters.customerNumber
@@ -528,7 +484,7 @@ export default {
           refEnginRecordNo: "",
           refProjectName: "",
           refUseUnit: "",
-           ...this.screenForm,
+          ...this.screenForm,
           // startDeliverTime: "",
         });
       } else {
@@ -550,7 +506,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
-         ...this.screenForm,
+        ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -573,7 +529,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
-         ...this.screenForm,
+        ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -594,7 +550,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
-         ...this.screenForm,
+        ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -614,7 +570,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
-         ...this.screenForm,
+        ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -625,8 +581,8 @@ export default {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
         enginOrderType: this.enginOrderType,
-         ...this.screenForm,
-                 examineStatus: this.examine,
+        ...this.screenForm,
+        examineStatus: this.examine,
         // startDeliverTime: "",
       });
     },

src/views/deposit_home/deposit_list.vue

@@ -11,7 +11,7 @@
         <el-form
           ref="screenForm"
           :model="screenForm"
-          label-width="120px"
+          label-width="140px"
           size="mini"
           label-position="left"
         >
@@ -57,6 +57,7 @@
               <el-form-item label="开始申请日期" prop="startSubmitTime">
                 <el-date-picker
                   v-model="screenForm.startSubmitTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -67,6 +68,7 @@
               <el-form-item label="结束申请日期" prop="endSubmitTime">
                 <el-date-picker
                   v-model="screenForm.endSubmitTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -77,6 +79,7 @@
               <el-form-item label="开始受理日期" prop="startConfirmTime">
                 <el-date-picker
                   v-model="screenForm.startConfirmTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -87,6 +90,7 @@
               <el-form-item label="结束受理日期" prop="endConfirmTime">
                 <el-date-picker
                   v-model="screenForm.endConfirmTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -95,8 +99,8 @@
             </el-col>
              <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  placeholder="请选择是否退押 " >
-              <el-option  label="默认" :value="null"></el-option>
+              <el-select style="width:100%" v-model="screenForm.isRefundDeposit"  clearable placeholder="请选择是否退押 " >
+
 
                 <el-option v-for="item in refundDepositArr"
                   :key="item.value"
@@ -106,10 +110,10 @@
               </el-select>
               </el-form-item>
             </el-col>
-   <el-col :xs="24" :sm="12" :lg="6">
+         <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-              <el-select style="width:100%" v-model="screenForm.examineStatus"  placeholder="请选择状态 " >
-              <el-option  label="默认" :value="null"></el-option>
+              <el-select style="width:100%" v-model="screenForm.examineStatus"  clearable placeholder="请选择状态 " >
+
 
                 <el-option v-for="item in examineStatusArr"
                   :key="item.value"
@@ -153,6 +157,7 @@
                      <el-form-item prop="startInstallTime">
                           <el-date-picker
                   v-model="screenForm.startInstallTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -163,6 +168,7 @@
                     <el-form-item prop="endInstallTime">
                                  <el-date-picker
                   v-model="screenForm.endInstallTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
                   class="dateStyle"
                   type="datetime"
                   placeholder="选择日期"
@@ -192,7 +198,43 @@
                 </el-form-item>
 
               </el-col>
+               <el-col :xs="24" :sm="12" :lg="6">
+               <el-form-item label="格力内部备注" prop="geLiInerNote">
+
+                        <el-input  v-model="screenForm.geLiInerNote" placeholder="请输入格力内部备注" ></el-input>
+
+                </el-form-item>
+
+              </el-col>
+                <el-col :xs="24" :sm="12" :lg="6">
+                  <el-form-item label="厂编号" prop="factoryNo">
 
+                  <el-input  v-model="screenForm.factoryNo" placeholder="请输入厂编号" ></el-input>
+
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="资料审核开始日期" prop="startAcceptTime">
+                <el-date-picker
+                  v-model="screenForm.startAcceptTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="资料审核结束日期" prop="endAcceptTime">
+                <el-date-picker
+                  v-model="screenForm.endAcceptTime"
+                   value-format="yyyy-MM-dd HH:mm:ss"
+                  class="dateStyle"
+                  type="datetime"
+                  placeholder="选择日期"
+                />
+              </el-form-item>
+            </el-col>
 
               </template>
             <el-col :xs="24" :sm="24" :lg="24">
@@ -501,7 +543,9 @@ export default {
         factoryNo:'',
         specialNo:'',
         refRegionWork:'',
-        endSubmitTime:''
+        endSubmitTime:'',
+        startAcceptTime:'',    endAcceptTime:'',
+        geLiInerNote:'',factoryNo:''
       }, // 搜索表单
       listLoading: false, // 列表加载loading
       deduction: '全部',
@@ -575,7 +619,9 @@ export default {
         ...this.screenForm
       }
       params.isRefundDeposit = this.deduction === '已退押' ? true : ''
-
+    if (this.screenForm.isRefundDeposit == true || this.screenForm.isRefundDeposit == false ) {
+      params.isRefundDeposit =this.screenForm.isRefundDeposit
+    }
       getList(params).then((res) => {
         this.dataList = res.data.records
         res.data.records.forEach((item) => {

src/views/deposit_home/refund_list.vue

@@ -11,28 +11,16 @@
       <br /><br />
       <!-- 筛选条件 -->
       <div>
-        <el-form
-          ref="screenForm"
-          :model="screenForm"
-          label-width="120px"
-          size="mini"
-          label-position="left"
-        >
+        <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-input
-                  v-model="screenForm.refEnginRecordNo"
-                  placeholder="请输入"
-                />
+                <el-input v-model="screenForm.refEnginRecordNo" placeholder="请输入" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="经销商编码/名称" prop="customerKeyword">
-                <el-input
-                  v-model="screenForm.customerKeyword"
-                  placeholder="请输入"
-                />
+                <el-input v-model="screenForm.customerKeyword" placeholder="请输入" />
               </el-form-item>
             </el-col>
             <!-- <el-col :xs="24" :sm="12" :lg="6">
@@ -43,75 +31,43 @@
                 ></el-input>
               </el-form-item>
             </el-col> -->
-              <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="行业类别" prop="refTradeCategory">
                 <el-input v-model="screenForm.refTradeCategory" placeholder="请输入"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="使用单位" prop="refUseUnit">
-                <el-input
-                  v-model="screenForm.refUseUnit"
-                  placeholder="请输入"
-                />
+                <el-input v-model="screenForm.refUseUnit" placeholder="请输入" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始申请日期" prop="startSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.startSubmitTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="screenForm.startSubmitTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
             </el-col>
-             <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束申请日期" prop="endSubmitTime">
-                <el-date-picker
-                  v-model="screenForm.endSubmitTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="screenForm.endSubmitTime" class="dateStyle" type="datetime" placeholder="选择日期" value-format="yyyy-MM-dd HH:mm:ss" />
               </el-form-item>
             </el-col>
 
-
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="是否退押 " prop="isRefundDeposit">
-                <el-select
-                  style="width: 100%"
-                  v-model="screenForm.isRefundDeposit"
-                  placeholder="请选择是否退押 "
-                >
+                <el-select style="width: 100%" v-model="screenForm.isRefundDeposit" placeholder="请选择是否退押 ">
                   <el-option label="默认" :value="null"></el-option>
 
-                  <el-option
-                    v-for="item in refundDepositArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                  <el-option v-for="item in refundDepositArr" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="状态 " prop="examineStatus">
-                <el-select
-                  style="width: 100%"
-                  v-model="screenForm.examineStatus"
-                  placeholder="请选择状态 "
-                >
+                <el-select style="width: 100%" v-model="screenForm.examineStatus" placeholder="请选择状态 ">
                   <el-option label="默认" :value="null"></el-option>
 
-                  <el-option
-                    v-for="item in examineStatusArr"
-                    :key="item.value"
-                    :label="item.label"
-                    :value="item.value"
-                  >
+                  <el-option v-for="item in examineStatusArr" :key="item.value" :label="item.label" :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -126,88 +82,87 @@
                 <el-input placeholder="请输入"></el-input>
               </el-form-item>
             </el-col> -->
-             <el-col :xs="24" :sm="12" :lg="6">
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="开始受理日期" prop="startConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.startConfirmTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="screenForm.startConfirmTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="结束受理日期" prop="endConfirmTime">
-                <el-date-picker
-                  v-model="screenForm.endConfirmTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                <el-date-picker v-model="screenForm.endConfirmTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
               </el-form-item>
             </el-col>
             <template v-if="!isCustomer">
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="审核人" prop="confirmName">
-                  <el-input
-                    v-model="screenForm.confirmName"
-                    placeholder="请输入审核人"
-                  />
+                  <el-input v-model="screenForm.confirmName" placeholder="请输入审核人" />
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="区域" prop="refRegionWork">
-                  <el-input
-                    v-model="screenForm.refRegionWork"
-                    placeholder="请输入区域"
-                  />
+                  <el-input v-model="screenForm.refRegionWork" placeholder="请输入区域" />
                 </el-form-item>
               </el-col>
-                 <el-col :xs="24" :sm="12" :lg="6">
-                <el-form-item label="安装日期"   style="margin-bottom:0">
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="安装日期" style="margin-bottom:0">
                   <div class="fanwei">
-                     <el-form-item prop="startInstallTime">
-                          <el-date-picker
-                        v-model="screenForm.startInstallTime"
-                        class="dateStyle"
-                        type="datetime"
-                        placeholder="选择日期"
-                      />
+                    <el-form-item prop="startInstallTime">
+                      <el-date-picker v-model="screenForm.startInstallTime" value-format="yyyy-MM-dd HH:mm:ss" class="dateStyle" type="datetime" placeholder="选择日期" />
 
-                     </el-form-item>
-                      <span>-</span>
+                    </el-form-item>
+                    <span>-</span>
                     <el-form-item prop="endInstallTime">
-                                 <el-date-picker
-                  v-model="screenForm.endInstallTime"
-                  class="dateStyle"
-                  type="datetime"
-                  placeholder="选择日期"
-                />
+                      <el-date-picker v-model="screenForm.endInstallTime" value-format="yyyy-MM-dd HH:mm:ss" class="dateStyle" type="datetime" placeholder="选择日期" />
 
-                     </el-form-item>
+                    </el-form-item>
                   </div>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="规格型号" prop="specification">
-                        <el-input  v-model="screenForm.specification" ></el-input>
+                  <el-input v-model="screenForm.specification"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-                  <el-form-item label="特价编号" prop="specialNo">
+                <el-form-item label="特价编号" prop="specialNo">
 
-                        <el-input  v-model="screenForm.specialNo" ></el-input>
+                  <el-input v-model="screenForm.specialNo"></el-input>
 
                 </el-form-item>
               </el-col>
               <el-col :xs="24" :sm="12" :lg="6">
-               <el-form-item label="跨区厂编号" prop="refFactoryNo">
+                <el-form-item label="跨区厂编号" prop="refFactoryNo">
+
+                  <el-input v-model="screenForm.refFactoryNo"></el-input>
+
+                </el-form-item>
+
+              </el-col>
+
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="格力内部备注" prop="refFactoryNo">
 
-                        <el-input  v-model="screenForm.refFactoryNo" ></el-input>
+                  <el-input v-model="screenForm.refFactoryNo"></el-input>
 
                 </el-form-item>
 
               </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="厂编号" prop="factoryNo">
+                  <el-input v-model="screenForm.factoryNo"></el-input>
+                </el-form-item>
+
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="资料审核开始日期" prop="startAcceptTime">
+                  <el-date-picker v-model="screenForm.startAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
+              <el-col :xs="24" :sm="12" :lg="6">
+                <el-form-item label="资料审核结束日期" prop="endAcceptTime">
+                  <el-date-picker v-model="screenForm.endAcceptTime" class="dateStyle" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择日期" />
+                </el-form-item>
+              </el-col>
               <!-- <el-col :xs="24" :sm="12" :lg="6">
                 <el-form-item label="产品编码" >
                   <div class="fanwei">
@@ -228,15 +183,15 @@
 
             </template>
             <el-col :xs="24" :sm="24" :lg="24">
-             <div class="fl">
-          <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
+              <div class="fl">
+                <!-- <el-radio-group @change="changeEnginOrderTypeFn" v-model="enginOrderType" size="mini">
             <el-radio-button label="HOME">家用工程</el-radio-button>
             <el-radio-button label="TRADE">商用工程</el-radio-button>
           </el-radio-group> -->
-          <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
-        </div>
+                <!-- <el-button type="primary" size="mini" @click="syncDateFn">同步资料日期</el-button> -->
+              </div>
               <el-form-item label="" class="fr">
-                     <el-button size="mini" @click="resetFn">清空</el-button>
+                <el-button size="mini" @click="resetFn">清空</el-button>
                 <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
               </el-form-item>
             </el-col>
@@ -280,13 +235,13 @@
                 <span>{{scope.row.refEnginRecordNo}}</span>
               </template>
             </el-table-column>
-              <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerNumber" />
                 <span>{{scope.row.customerNumber}}</span>
               </template>
             </el-table-column>
-             <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.customerName" />
                 <span>{{scope.row.customerName}}</span>
@@ -298,9 +253,9 @@
                 <span>{{scope.row.refFactoryNo}}</span>
               </template>
             </el-table-column>
-             <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="厂编号" prop="factoryNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
-              <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
+            <el-table-column align="right" label="特价编号" prop="specialNo" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="left" label="项目类别" prop="refTradeCategory" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
@@ -316,7 +271,6 @@
               </template>
             </el-table-column>
 
-
             <el-table-column align="left" label="区域" prop="refRegionWork" min-width="160" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.refRegionWork" />
@@ -324,13 +278,13 @@
               </template>
             </el-table-column>
 
-                 <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="物料编码" prop="materialNumber" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialNumber" />
                 <span>{{scope.row.materialNumber}}</span>
               </template>
             </el-table-column>
-              <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="260" show-overflow-tooltip>
+            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="260" show-overflow-tooltip>
               <template slot-scope="scope">
                 <CopyButton :copyText="scope.row.materialOldNumber" />
                 <span>{{scope.row.materialOldNumber}}</span>
@@ -357,7 +311,6 @@
             <!-- <el-table-column align="right" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip>
             </el-table-column> -->
 
-
             <el-table-column align="right" label="安装日期" prop="installDate" min-width="160" show-overflow-tooltip>
             </el-table-column>
             <el-table-column align="left" label="审核人" prop="confirmBy" min-width="160" show-overflow-tooltip>
@@ -414,7 +367,7 @@ export default {
       pageSize: 10, // 每页数量
       listTotal: 0, // 列表总数
       dataList: [], // 列表数据
-        screenForm: {
+      screenForm: {
         confirmName: "", // 审核人
         createName: "", // 创建人
         customerKeyword: "", // 客户编码/客户名称
@@ -432,15 +385,19 @@ export default {
         startInstallTime: "",
         endConfirmTime: "",
         endInstallTime: "",
-        specification:'',
-        refFactoryNo:'',
+        specification: "",
+        refFactoryNo: "",
         factoryNo: "",
         specialNo: "",
         refRegionWork: "",
-        endSubmitTime:'',
-        refTradeCategory:''
+        endSubmitTime: "",
+        refTradeCategory: "",
+        refFactoryNo: "",
+        factoryNo: "",
+        startAcceptTime: "",
+        endAcceptTime: "",
       }, // 搜索表单
-       refundDepositArr: [
+      refundDepositArr: [
         {
           label: "是",
           value: true,
@@ -485,11 +442,11 @@ export default {
       pageSize: this.pageSize,
       pageNum: this.currentPage,
       enginOrderType: this.enginOrderType,
-       ...this.screenForm,
+      ...this.screenForm,
       // startDeliverTime: "",
     });
   },
-   computed: {
+  computed: {
     isCustomer() {
       return (
         this.$store.getters.customerId && this.$store.getters.customerNumber
@@ -528,7 +485,7 @@ export default {
           refEnginRecordNo: "",
           refProjectName: "",
           refUseUnit: "",
-           ...this.screenForm,
+          ...this.screenForm,
           // startDeliverTime: "",
         });
       } else {
@@ -550,7 +507,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
-         ...this.screenForm,
+        ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -573,7 +530,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
-         ...this.screenForm,
+        ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -594,7 +551,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
-         ...this.screenForm,
+        ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -614,7 +571,7 @@ export default {
         refEnginRecordNo: "",
         refProjectName: "",
         refUseUnit: "",
-         ...this.screenForm,
+        ...this.screenForm,
         // startDeliverTime: "",
       });
     },
@@ -625,8 +582,8 @@ export default {
         pageSize: this.pageSize,
         pageNum: this.currentPage,
         enginOrderType: this.enginOrderType,
-         ...this.screenForm,
-                 examineStatus: this.examine,
+        ...this.screenForm,
+        examineStatus: this.examine,
         // startDeliverTime: "",
       });
     },

src/views/finance/account_list.vue

@@ -60,7 +60,7 @@
       <!-- 列表 -->
       <div class="mymain-container">
         <div class="table">
-          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+          <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries">
             <el-table-column align="left" label="序号" type="index" width="80" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="月份" prop="month" min-width="100" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="对账状态" prop="isReconciliation" min-width="100" show-overflow-tooltip>
@@ -99,7 +99,7 @@
             <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="收付款金额" prop="amount" min-width="130" show-overflow-tooltip>
               <template slot-scope="scope">
-                {{ scope.row.amount | numToFixed }}
+                {{(scope.row.amountType == 'OUT'?  -scope.row.amount:scope.row.amount) | numToFixed }}
               </template>
             </el-table-column>
             <!-- <el-table-column
@@ -131,6 +131,7 @@ import {
   getWalletCustomerList,
 } from "@/api/finance/account_list";
 import AccountListDetail from "./components/account_list-detail";
+import { numToFixed } from "@/filters";
 export default {
   components: {
     AccountListDetail,
@@ -176,6 +177,37 @@ export default {
     });
   },
   methods: {
+    //合计
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+        }
+        if (index === 10) {
+          let arr = [];
+          data.forEach((v) => {
+            if (v.amountType == "OUT") {
+              arr.push(-v.amount);
+            } else {
+              arr.push(v.amount);
+            }
+          });
+
+          let a = arr.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = numToFixed(a);
+        }
+      });
+      return sums;
+    },
     //清空
     clearFn() {
       this.$refs.searchForm.resetFields();
@@ -226,10 +258,10 @@ export default {
     //获取列表
     async getDataList(data) {
       let res = await getFinanceStandingBookList(data);
-      res.data.records.forEach((item) => {
-        item.sums1 = [];
-        item.sums2 = ["amount"];
-      });
+      // res.data.records.forEach((item) => {
+      //   item.sums1 = [];
+      //   item.sums2 = ["amount"];
+      // });
       this.dataList = res.data.records;
       this.listTotal = res.data.total;
     },

src/views/finance/components/account_list-detail.vue

@@ -59,7 +59,7 @@
     <!-- 列表 -->
     <div class="mymain-container">
       <div class="table">
-        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="$getSummaries">
+        <el-table v-loading="listLoading" :data="dataList" element-loading-text="Loading" border fit highlight-current-row stripe show-summary :summary-method="getSummaries">
           <el-table-column align="left" label="序号" type="index" width="80" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="月份" prop="month" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="对账状态" prop="isReconciliation" min-width="100" show-overflow-tooltip>
@@ -98,7 +98,7 @@
           <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="收付款金额" prop="amount" min-width="130" show-overflow-tooltip>
             <template slot-scope="scope">
-              {{ scope.row.amount | numToFixed }}
+              {{(scope.row.amountType == 'OUT'?  -scope.row.amount:scope.row.amount) | numToFixed }}
             </template>
           </el-table-column>
           <!-- <el-table-column
@@ -125,6 +125,7 @@ import {
   getCustomerList,
   getWalletCustomerList,
 } from "@/api/finance/account_list";
+import { numToFixed } from "@/filters";
 export default {
   data() {
     return {
@@ -156,6 +157,37 @@ export default {
     });
   },
   methods: {
+    //合计
+    getSummaries(param) {
+      const { columns, data } = param;
+      const sums = [];
+      columns.forEach((column, index) => {
+        if (index === 0) {
+          sums[index] = "合计";
+        }
+        if (index === 10) {
+          let arr = [];
+          data.forEach((v) => {
+            if (v.amountType == "OUT") {
+              arr.push(-v.amount);
+            } else {
+              arr.push(v.amount);
+            }
+          });
+
+          let a = arr.reduce((prev, curr) => {
+            const value = Number(curr);
+            if (!isNaN(value)) {
+              return prev + curr;
+            } else {
+              return prev;
+            }
+          }, 0);
+          sums[index] = numToFixed(a);
+        }
+      });
+      return sums;
+    },
     //清空
     clearFn() {
       this.$refs.searchForm.resetFields();

src/views/finance/standbook_list.vue

@@ -57,8 +57,12 @@
               </el-date-picker>
             </el-form-item>
           </el-col>
-
-          <el-col :xs="24" :sm="12" :lg="18">
+        <el-col :xs="24" :sm="12" :lg="6">
+            <el-form-item label="经销商编码" prop="customerNumber">
+              <el-input v-model="searchForm.customerNumber" placeholder="请输入经销商编码"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :sm="12" :lg="12">
             <el-form-item label="" class="fr">
               <el-button size="mini" @click="resetFn">清空</el-button>
               <el-button size="mini" type="primary" @click="searchFn">搜索</el-button>
@@ -338,6 +342,7 @@ export default {
         billNo: "",
         startTime: "",
         endTime: "",
+        customerNumber:''
       }, //搜索表单
       listLoading: false, // 列表加载loading
 
@@ -831,18 +836,17 @@ export default {
       if (this.$route.query.customerName && this.$route.query.customerNumber) {
         this.getDataList({
           ...this.searchForm,
-
           pageSize: this.pageSize,
           pageNum: this.currentPage,
           type: this.bill,
           customerName: this.$route.query.customerName,
-          customerNumber: this.$route.query.customerNumber,
+          customerNumber: this.$route.query.customerNumber || this.searchForm.customerNumber,
         });
         this.getAmountList({
           ...this.searchForm,
           type: this.bill,
           customerName: this.$route.query.customerName,
-          customerNumber: this.$route.query.customerNumber,
+          customerNumber: this.$route.query.customerNumber  ,
         });
       } else if (this.isCustomer) {
         this.getDataList({
@@ -861,7 +865,7 @@ export default {
         this.getDataList({
           ...this.searchForm,
           customerName: this.customerName,
-          customerNumber: this.customerNumber,
+          customerNumber: this.customerNumber  || this.searchForm.customerNumber,
 
           pageSize: this.pageSize,
           pageNum: this.currentPage,
@@ -871,7 +875,7 @@ export default {
           ...this.searchForm,
           type: this.bill,
           customerName: this.customerName,
-          customerNumber: this.customerNumber,
+          customerNumber: this.customerNumber  ,
         });
       }
     },

src/views/setting/other.vue

@@ -9,6 +9,8 @@
       <el-radio-button label="sixth">机型类别</el-radio-button>
       <el-radio-button label="seventh">登录类型</el-radio-button>
       <el-radio-button label="eigth">权限分类</el-radio-button>
+          <el-radio-button label="receipt"  v-if="$checkBtnRole('receipt', $route.meta.roles)">发票</el-radio-button>
+
     </el-radio-group>
 
     <div v-show="formType === 'first'">
@@ -158,6 +160,30 @@
       </div>
 
     </div>
+    <div  v-show="formType === 'receipt'" >
+      <div style="margin: 40px 0 30px;">
+         <el-date-picker
+              v-model="value1"
+              size="mini"
+              type="daterange"
+               value-format="yyyy-MM-dd HH:mm:ss"
+              range-separator="至"
+              :picker-options="setDisabled"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              style="margin:0 10px"
+            >
+            </el-date-picker>
+            <el-button
+              size="mini"
+
+              type="warning"
+              icon="el-icon-finished"
+              @click="updateReceipt"
+              >更新发票</el-button
+            >
+      </div>
+    </div>
 
     <!-- //弹窗 -->
     <el-dialog :title="title" :visible.sync="dialogForm" width="30%" :show-close="false" :close-on-click-modal="false">
@@ -184,6 +210,7 @@ import {
   editDictList,
   addDictList,
   deleDictList,
+  updateReceipt
 } from "@/api/common";
 
 export default {
@@ -223,6 +250,22 @@ export default {
       sixthForm: [],
       seventhForm: [],
       eigthForm: [],
+      value1:'',
+      choiceDate:'',
+      setDisabled: {
+        disabledDate: (time) => {
+          if (this.choiceDate) {
+            const res = 13 * 24 * 3600 * 1000;
+            const minTime = this.choiceDate - res;
+            const maxTime = this.choiceDate + res;
+            return time.getTime() < minTime || time.getTime() > maxTime;
+          }
+        },
+        onPick: ({ maxDate, minDate }) => {
+          this.choiceDate = minDate.getTime();
+          if (maxDate) this.choiceDate = "";
+        },
+      },
     };
   },
   created() {
@@ -311,6 +354,8 @@ export default {
     },
 
     changeType(val) {
+
+    if (this.formType === 'receipt') return
       this.getDetail(val);
     },
 
@@ -375,6 +420,22 @@ export default {
         this.getDetail(type);
       });
     },
+        updateReceipt() {
+
+    if (!this.value1) {
+      this.$errorMsg('请选择时间')
+      return
+    }
+      updateReceipt({
+      startTime:this.value1[0],
+      endTime:this.value1[1]
+      }).then(res=>{
+
+        this.$successMsg("已更新");
+         this.value1 = ''
+      })
+
+    },
   },
 };
 </script>

src/views/stock/stock_list.vue

@@ -6,18 +6,18 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓库" prop="warehouse">
-              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" @change="changeWarehouse" clearable>
+              <el-select v-model="screenForm.warehouse" placeholder="请选择仓库" @change="changeWarehouse" clearable   multiple >
                 <el-option :label="item.name" :value="item.id" v-for="(item, index) in warehouseList" :key="index"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :xs="24" :sm="12" :lg="6">
+          <!-- <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="仓位" prop="position">
               <el-select v-model="screenForm.position" placeholder="请选择仓位" clearable>
                 <el-option :label="item.name" :value="item.id" v-for="(item, index) in positionList" :key="index"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <!-- <el-col :xs="24" :sm="12" :lg="6">
             <el-form-item label="产品大类" prop="type">
               <el-select v-model="screenForm.type" placeholder="请选择产品大类" @change="changeType" clearable>
@@ -53,7 +53,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :sm="24" :lg="24" class="tr">
+          <el-col :xs="24" :sm="24" :lg="12" class="tr">
             <el-form-item label="">
               <el-button @click="resetScreenForm">清空</el-button>
               <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -137,7 +137,7 @@ export default {
       dataList: null, // 列表数据
       listLoading: false, // 列表加载loading
       screenForm: { // 筛选表单数据
-        warehouse: '',
+        warehouse: [],
         position: '',
         goodsName: '',
         goodsNum: '',
@@ -155,8 +155,10 @@ export default {
 
   computed: {
     exParams() {
+        const correspondNameS = this.fliterData()
       return {
-        correspondId: this.screenForm.warehouse,
+         correspondId:  this.screenForm.warehouse.join(),
+        correspondNameS:correspondNameS.join('/'),
         stockId: this.screenForm.position,
         materialName: this.screenForm.goodsName,
         materialNumber: this.screenForm.goodsCode,
@@ -215,23 +217,24 @@ export default {
 
     // 更改仓库
     changeWarehouse() {
-      this.screenForm.position = '';
-      if(this.screenForm.warehouse) {
-        let obj = this.warehouseList.find(o => o.id == this.screenForm.warehouse);
-        this.positionList = obj.kingDeeStocks;
-      }else {
-        this.positionList = [];
-      }
+      // this.screenForm.position = '';
+      // if(this.screenForm.warehouse) {
+      //   let obj = this.warehouseList.find(o => o.id == this.screenForm.warehouse);
+      //   this.positionList = obj.kingDeeStocks;
+      // }else {
+      //   this.positionList = [];
+      // }
     },
 
     // 查询列表
     getList() {
       this.listLoading = true;
-
+        const correspondNameS = this.fliterData()
       let params = {
         pageNum: this.currentPage,
         pageSize: this.pageSize,
-        correspondId: this.screenForm.warehouse,
+        correspondId:  this.screenForm.warehouse.join(),
+        correspondNameS:correspondNameS.join('/'),
         stockId: this.screenForm.position,
         materialName: this.screenForm.goodsName,
         materialNumber: this.screenForm.goodsCode,
@@ -272,7 +275,19 @@ export default {
       this.currentPage = val;
       this.getList();
     },
+    fliterData(){
+           const correspondNameS = []
+        if( this.screenForm.warehouse &&  this.screenForm.warehouse.length)
+         this.screenForm.warehouse.forEach(e=>{
+           this.warehouseList.filter(k=>{
+               if(e === k.id){
+                correspondNameS.push(k.name)
+              }
+           })
+        })
 
+        return correspondNameS
+    }
   }
 }
 </script>

src/views/supply/apply/components/apply_detail.vue

@@ -29,15 +29,15 @@
             <div class="label">经销商名称</div>
             <div class="value">{{detailData.customerName}}</div>
           </el-col>
-          <el-col :span="8" class="item">
+          <el-col :span="24" class="item">
             <div class="label">仓库</div>
             <div class="value">{{detailData.correspondName}}</div>
           </el-col>
-            <el-col :span="12" class="item">
+            <!-- <el-col :span="16" class="item">
             <div class="label">文件编号</div>
-            <div class="value">{{detailData.itemFileNo}}</div>
-          </el-col>
-          <el-col :span="16" class="item">
+            <div class="value">{{detailData.fileNo}}</div>
+          </el-col> -->
+          <el-col :span="24" class="item">
             <div class="label">备注</div>
             <div class="value">
               <!-- {{detailData.remark}} -->
@@ -108,7 +108,9 @@
           <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
+                     <el-table-column align="left" label="文件编号" prop="fileNo" min-width="100" show-overflow-tooltip></el-table-column>
+
+        <el-table-column align="right" label="含税单价" prop="singlePayPrice" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.singlePayPrice | numToFixed}}
             </template>
@@ -128,13 +130,13 @@
               {{scope.row.totalDiscAmount | numToFixed}}
             </template>
           </el-table-column>
-          <el-table-column align="right" label="政策说明" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="销售政策名称" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
 
           <el-table-column align="right" label="申请数量" prop="invoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip v-if="detailData.type !== 2"></el-table-column>
-          <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/apply/components/apply_examine.vue

@@ -36,6 +36,11 @@
           <div class="label">备注</div>
           <div class="value">{{detailData.remark}}</div>
         </el-col>
+
+            <!-- <el-col :span="24" class="item">
+            <div class="label">文件编号</div>
+            <div class="value">{{detailData.fileNo}}</div>
+          </el-col> -->
         <el-col :span="24" class="item file">
           <div class="label">附件</div>
           <div class="value">
@@ -82,7 +87,11 @@
         <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
+
+             <el-table-column align="left" label="文件编号" prop="fileNo" min-width="100" show-overflow-tooltip></el-table-column>
+
+
+     <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.price | numToFixed }}
           </template>
@@ -99,21 +108,22 @@
           </template>
         </el-table-column>
         <el-table-column align="right" label="已退数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.headerRemark" size="small"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <!-- <el-table-column align="left" label="表头备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
           </template>
         </el-table-column>
+    <el-table-column align="right" label="销售政策名称" prop="policyTitle" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
       </el-table>

src/views/supply/apply/components/apply_form.vue

@@ -44,7 +44,7 @@
         </el-col>
         <el-col :xs="24" :sm="24" :lg="24">
           <el-form-item label="备注" prop="headerRemark">
-            <el-input v-model="mainForm.headerheaderRemark" placeholder="请输入备注"></el-input>
+            <el-input v-model="mainForm.headerRemark" placeholder="请输入备注"></el-input>
           </el-form-item>
         </el-col>
         <el-col :xs="24" :sm="8" :lg="8">
@@ -85,11 +85,16 @@
         </el-table-column>
         <el-table-column align="center" label="已申请数量" prop="alreadyInvoiceNum" min-width="100" show-overflow-tooltip></el-table-column>
         <el-table-column align="center" label="未申请数量" prop="canApply" min-width="100" show-overflow-tooltip> </el-table-column>
-        <el-table-column align="center" label="备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
+          <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.headerRemark" size="small"></el-input>
           </template>
         </el-table-column>
+            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
+          </template>
+        </el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="deleteItem(scope.$index)">删除</el-button>
@@ -280,6 +285,7 @@ export default {
         this.mainForm.jxsName = data.customerName;
         this.mainForm.createMan = data.createBy;
         this.mainForm.headerRemark = data.headerRemark;
+         this.mainForm.remark = data.remark;
         this.screenForm.warehouse = data.correspondId;
         this.fileList = data.fileUrl ? [{
           url: data.fileUrl,

src/views/supply/apply/components/apply_return_form.vue

@@ -100,11 +100,18 @@
             </el-select>
           </template>
         </el-table-column> -->
-        <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.remark" size="small"></el-input>
+            <el-input v-model="scope.row.headerRemark" size="small"></el-input>
           </template>
         </el-table-column>
+            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
+          </template>
+        </el-table-column>
+
+
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="deleteItem(scope.$index)">删除</el-button>
@@ -483,7 +490,7 @@ export default {
     submitAddGoods() {
       let tableSelection = [];
       this.tableGoodsList.forEach(item => {
-        if((item.invoiceNum || item.invoiceNum === 0) && !item.selected) {
+        if((item.invoiceNum ) && !item.selected) {
           tableSelection.push(item);
         }
       });
@@ -498,6 +505,7 @@ export default {
       this.isShowDialog = false;
       this.tableGoodsList = [];
 
+      this.mainForm.remark = tableSelection[0].headerRemark
       this.goodsList = this.goodsList.concat(tableSelection);
     },
 
@@ -532,7 +540,8 @@ export default {
               correspondId: item.correspondId,
               correspondName: item.correspondName,
               refundableQty: item.invoiceNum,
-              remark: item.remark,
+              headerRemark: item.headerRemark,
+              invoiceRemark:item.invoiceRemark,
               salesOrderId: item.id,
               salesOrderItemId: item.salesOrderItemId
             }

src/views/supply/apply/components/engin_detail.vue

@@ -38,8 +38,8 @@
             <div class="value">{{detailData.refProjectName}}</div>
           </el-col>
         <el-col :span="8" class="item">
-            <div class="label">文件编码</div>
-            <div class="value">{{detailData.itemFileNo}}</div>
+            <div class="label">文件编号</div>
+            <div class="value">{{detailData.fileNo}}</div>
           </el-col>
 
 
@@ -166,7 +166,7 @@
           </el-table-column>
           <el-table-column align="right" label="申请数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="right" label="审批数量" prop="approvalNumber" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="表体备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
           <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>

src/views/supply/apply/components/engin_examine.vue

@@ -145,11 +145,17 @@
             <el-input v-model="scope.row.approvalNumber" disabled size="small" type="number"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
-          <template slot-scope="scope">
+       <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
+   <template slot-scope="scope">
+            <el-input v-model="scope.row.headerRemark" size="small"></el-input>
+          </template>
+</el-table-column>
+          <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
+          <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
+               <template slot-scope="scope">
             <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
           </template>
-        </el-table-column>
+          </el-table-column>
       </el-table>
     </div>
 

src/views/supply/apply/components/engin_form.vue

@@ -170,9 +170,14 @@
             <el-input v-model="scope.row.invoiceNum" size="small"></el-input>
           </template>
         </el-table-column>
-        <el-table-column align="center" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <el-table-column align="center" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <el-input v-model="scope.row.remark" size="small"></el-input>
+            <el-input v-model="scope.row.headerRemark" size="small"></el-input>
+          </template>
+        </el-table-column>
+        <el-table-column align="center" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
           </template>
         </el-table-column>
         <el-table-column align="center" label="操作" width="100" fixed="right">
@@ -726,7 +731,6 @@ export default {
           let correspondName = this.warehouseList[findElem(this.warehouseList, 'id', this.screenForm.warehouse)].name;
           let params = {
             // orderTime: this.mainForm.orderDate + ' 00:00:00',
-            remark: this.mainForm.remark,
             enginOrderNo: this.mainForm.loginNum,
             refProjectName: this.mainForm.refProjectName,
             refTradeCategory:this.mainForm.refTradeCategory,

src/views/supply/apply/engin_list.vue

@@ -172,6 +172,8 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="项目名称" prop="refProjectName" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="项目类别" prop="refProjectCategory" min-width="120" show-overflow-tooltip></el-table-column>
+
             <el-table-column align="left" label="使用单位" prop="refUseUnit" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">

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

@@ -76,7 +76,7 @@
             </template>
           </el-table-column>
           <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>

src/views/supply/implement/implement_list.vue

@@ -162,6 +162,10 @@
                 <span>{{scope.row.specification}}</span>
               </template>
             </el-table-column>
+
+             <el-table-column align="left" label="直调状态" prop="directTransferStatusName" min-width="100" show-overflow-tooltip>
+             </el-table-column>
+
             <el-table-column align="left" label="钱包" prop="walletName" min-width="250" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
             <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
@@ -197,9 +201,9 @@
             <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
            <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
           <el-table-column align="left" label="归属业务员" prop="newServiceName" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
+            <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column> -->
+            <el-table-column align="left" label="表头备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
           </el-table>
         </div>
       </div>

src/views/supply/implement/implement_total_list.vue

@@ -0,0 +1,385 @@
+<template>
+  <div class="app-container">
+    <div>
+      <!-- 筛选条件 -->
+      <div class="screen-container">
+        <el-form ref="screenForm" :model="screenForm" label-width="100px" size="mini" label-position="left">
+          <el-row :gutter="20">
+            <!-- <el-col :xs="24" :sm="24" :lg="24">
+              <el-form-item prop="status" label-width="0">
+                <el-radio-group v-model="screenForm.status" @change="getList()">
+                  <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{item.label}}</el-radio-button>
+                </el-radio-group>
+              </el-form-item>
+            </el-col> -->
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品编码" prop="goodsCode">
+                <el-input v-model="screenForm.goodsCode" placeholder="请输入产品编码"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="销售订单" prop="saleNum">
+                <el-input v-model="screenForm.saleNum" placeholder="请输入销售订单"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="经销商" prop="dealer">
+                <el-input v-model="screenForm.dealer" placeholder="请输入经销商"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="产品名称" prop="goodsName">
+                <el-input v-model="screenForm.goodsName" placeholder="请输入产品名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="规格型号" prop="model">
+                <el-input v-model="screenForm.model" placeholder="请输入规格型号"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="项目名称" prop="enginName">
+                <el-input v-model="screenForm.enginName" placeholder="请输入项目名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="工程登录编号" prop="loginNum">
+                <el-input v-model="screenForm.loginNum" placeholder="请输入工程登录编号"></el-input>
+              </el-form-item>
+            </el-col>
+               <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="存货类别" prop="k3CategoryNumber">
+                 <el-select v-model="screenForm.k3CategoryNumber" filterable  placeholder="请选择">
+                    <el-option
+                      v-for="item in categoryList"
+                      :key="item.id"
+                      :label="item.name"
+                      :value="item.id">
+                    </el-option>
+                  </el-select>
+              </el-form-item>
+              <!-- categoryList -->
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="下单日期" prop="date">
+                <el-date-picker
+                  v-model="screenForm.date"
+                  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="serviceName ">
+                <el-input v-model="screenForm.serviceName " placeholder="请输入表头业务员"></el-input>
+              </el-form-item>
+            </el-col>
+
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="表体业务员" prop="itemServiceName">
+                <el-input v-model="screenForm.itemServiceName" placeholder="请输入表体业务员"></el-input>
+              </el-form-item>
+            </el-col>
+    <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="归属业务员" prop="newServiceName">
+                <el-input v-model="screenForm.newServiceName" placeholder="请输入归属业务员"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
+              <el-form-item label="">
+                <el-button @click="resetScreenForm">清空</el-button>
+                <el-button type="primary" @click="submitScreenForm">搜索</el-button>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+
+      <div class="mymain-container">
+        <div class="btn-group clearfix">
+          <div class="fr">
+            <ExportButton :exUrl="'/retail/exec/listTotalExport'" :exParams="exParams" />
+          </div>
+        </div>
+        <div class="table">
+          <el-table
+            v-loading="listLoading"
+            :data="dataList"
+            element-loading-text="Loading"
+            border
+            fit
+            highlight-current-row
+            stripe
+            show-summary
+            :summary-method="$getSummaries">
+            <el-table-column align="left" label="下单日期" prop="createTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="受订日期" prop="theTime" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="销售订单" prop="id" min-width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.id" />
+                <span>{{scope.row.id}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="经销商编码" prop="customerNumber" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerNumber" />
+                <span>{{scope.row.customerNumber}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="经销商名称" prop="customerName" min-width="250" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.customerName" />
+                <span>{{scope.row.customerName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="销售类型" prop="saleTypeName" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="物料编码" prop="materialCode" min-width="120" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialCode" />
+                <span>{{scope.row.materialCode}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="产品编码" prop="materialOldNumber" min-width="140" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialOldNumber" />
+                <span>{{scope.row.materialOldNumber}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.materialName" />
+                <span>{{scope.row.materialName}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="规格型号" prop="specification" min-width="350" show-overflow-tooltip>
+              <template slot-scope="scope">
+                <CopyButton :copyText="scope.row.specification" />
+                <span>{{scope.row.specification}}</span>
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="直调状态" prop="directTransferStatusName" min-width="100" show-overflow-tooltip>
+             </el-table-column>
+            <el-table-column align="left" label="钱包" prop="walletName" min-width="250" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="订单未发货数量" prop="refundableQty" min-width="120" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="总数量" prop="qty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="退订数量" prop="retiredQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="退货数量" prop="refundProductQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="订单金额" prop="payAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.payAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="订单返利金额" prop="payRebateAmount" min-width="110" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.payRebateAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="发货金额" prop="hasSendAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.hasSendAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="发货数量" prop="hasSendQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="直调数量" prop="directTransferQty" min-width="100" show-overflow-tooltip></el-table-column>
+            <el-table-column align="right" label="退订金额" prop="retiredAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.retiredAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="right" label="退货金额" prop="refundProductAmount" min-width="100" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.refundProductAmount | numToFixed}}
+              </template>
+            </el-table-column>
+            <el-table-column align="left" label="表头业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+           <el-table-column align="left" label="表体业务员" prop="itemServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="归属业务员" prop="newServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+            <!-- <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column> -->
+            <el-table-column align="left" label="表头备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+            <el-table-column align="left" label="表体备注" prop="itemRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          </el-table>
+        </div>
+      </div>
+      <div class="pagination clearfix">
+        <div class="fr">
+          <el-pagination
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-sizes="[10, 20, 30, 50]"
+            :page-size="10"
+            layout="total, sizes, prev, pager, next, jumper"
+            :total="listTotal">
+          </el-pagination>
+        </div>
+      </div>
+    </div>
+
+  </div>
+</template>
+
+<script>
+import { getTotalList  } from '@/api/supply/implement'
+import { getCategoryList } from '@/api/common'
+
+let that
+export default {
+  filters: {
+    statusFilter(val) {
+      let obj = that.statusList.find(o => o.value == val);
+      return obj ? obj.label : ''
+    }
+  },
+  data() {
+    return {
+      currentPage: 1, // 当前页码
+      pageSize: 10, // 每页数量
+      listTotal: 0, // 列表总数
+      dataList: null, // 列表数据
+      listLoading: false, // 列表加载loading
+      screenForm: { // 筛选表单数据
+        status: '2',
+        goodsCode: '',
+        saleNum: '',
+        dealer: '',
+        goodsName: '',
+        model: '',
+        date: '',
+        serviceName : '',
+        itemServiceName:'',
+        newServiceName: '',
+        enginName: '',
+        loginNum: '',
+        k3CategoryNumber:''
+      },
+      categoryList:[],
+      statusList: [
+        { label: '政策零售订单', value: '2' },
+        { label: '零售订单', value: '1' },
+        { label: '家用工程订单', value: 'HOME' },
+        { label: '商用工程订单', value: 'TRADE' },
+      ],
+    }
+  },
+
+  computed: {
+    exParams() {
+      return {
+        type: this.screenForm.status,
+        materialOldNumber: this.screenForm.goodsCode,
+        id: this.screenForm.saleNum,
+        customerName: this.screenForm.dealer,
+        materialName: this.screenForm.goodsName,
+        specification: this.screenForm.model,
+        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        serviceName: this.screenForm.serviceName ,
+        newServiceName: this.screenForm.newServiceName,
+          itemServiceName:this.screenForm.itemServiceName,
+        projectName: this.screenForm.enginName,
+        enginRecordNo: this.screenForm.orderNum,
+        k3CategoryNumber:this.screenForm.k3CategoryNumber
+      }
+    },
+  },
+
+  beforeCreate() {
+    that = this;
+  },
+
+  created() {
+    this.getList();
+    this.getCategoryList()
+  },
+
+  methods: {
+    // 查询按钮权限
+    checkBtnRole(value) {
+      // let btnRole = this.$route.meta.roles;
+      // if(!btnRole) {return true}
+      // let index = btnRole.indexOf(value);
+      // return index >= 0;
+      return true
+    },
+
+    // 查询列表
+    getList() {
+      this.listLoading = true;
+
+      let params = {
+        pageNum: this.currentPage,
+        pageSize: this.pageSize,
+        type: this.screenForm.status,
+        materialOldNumber: this.screenForm.goodsCode,
+        id: this.screenForm.saleNum,
+        customerName: this.screenForm.dealer,
+        materialName: this.screenForm.goodsName,
+        specification: this.screenForm.model,
+        startTime: this.screenForm.date ? this.screenForm.date[0] : '',
+        endTime: this.screenForm.date ? this.screenForm.date[1] : '',
+        serviceName: this.screenForm.serviceName ,
+        newServiceName: this.screenForm.newServiceName,
+            itemServiceName:this.screenForm.itemServiceName,
+        projectName: this.screenForm.enginName,
+        enginRecordNo: this.screenForm.orderNum,
+        k3CategoryNumber:this.screenForm.k3CategoryNumber
+      };
+      getTotalList(params).then((res) => {
+        res.data.records.forEach(item => {
+          item.sums1 = ['refundableQty', 'qty', 'retiredQty', 'hasSendQty', 'directTransferQty', 'refundProductQty'];
+          item.sums2 = ['payAmount', 'payRebateAmount', 'hasSendAmount', 'retiredAmount', 'refundProductAmount'];
+        })
+        this.dataList = res.data.records;
+        this.listTotal = res.data.total;
+        this.listLoading = false;
+      })
+    },
+    // 获取存货类别列表
+  getCategoryList(){
+    getCategoryList({
+      pageNum:1,
+      pageSize:-1,
+      keyword:''
+    }).then(res=>{
+
+      this.categoryList =   res.data.records
+    })
+  },
+    // 提交筛选表单
+    submitScreenForm() {
+      this.currentPage = 1;
+      this.getList();
+    },
+
+    // 重置筛选表单
+    resetScreenForm() {
+      this.$refs.screenForm.resetFields();
+      this.currentPage = 1;
+      this.getList();
+    },
+
+    // 更改每页数量
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.currentPage = 1;
+      this.getList();
+    },
+
+    // 更改当前页
+    handleCurrentChange(val) {
+      this.currentPage = val;
+      this.getList();
+    },
+
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

src/views/supply/implement/nsales_list.vue

@@ -39,8 +39,8 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品编码" prop="chNum">
-                <el-input v-model="screenForm.chNum" placeholder="请输入产品编码"></el-input>
+              <el-form-item label="物料编码" prop="chNum">
+                <el-input v-model="screenForm.chNum" placeholder="请输入物料编码"></el-input>
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">

src/views/supply/policy/components/retail_form.vue

@@ -1853,7 +1853,7 @@ export default {
             type: 2, // 1:普通零售单，2:政策零售单
             retailOrderItemList: this.goodsList,
             policyId: this.policyId,
-            fileNum:this.mainForm.fileNum
+            fileNo:this.mainForm.fileNum
           }
           console.log(params)
           if (this.listItem) {

src/views/supply/policy/policy_list.vue

@@ -309,6 +309,13 @@
               min-width="100"
               show-overflow-tooltip
             />
+              <el-table-column
+              align="left"
+              label="文件编号"
+              prop="fileNo"
+              min-width="100"
+              show-overflow-tooltip
+            />
             <el-table-column
               align="left"
               label="是否直调"

src/views/supply/retail/components/retail_form.vue

@@ -95,11 +95,11 @@
           </template>
         </el-table-column>
         <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-        <el-table-column align="left" label="文件编号" prop="fileNo" min-width="200" show-overflow-tooltip>
+        <!-- <el-table-column align="left" label="文件编号" prop="fileNo" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope">
                <el-input v-model="scope.row.fileNo" size="small" ></el-input>
           </template>
-           </el-table-column>
+           </el-table-column> -->
       <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.price" size="small" type="number" v-if="listItem && !isDealer"></el-input>
@@ -177,7 +177,7 @@
             <div>{{ scope.row.status1 | status1Filter }}</div>
           </template>
         </el-table-column> -->
-        <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip v-if="!listItem">
+        <el-table-column align="center" label="仓库状态" prop="status2" min-width="100" show-overflow-tooltip >
           <template slot-scope="scope">
             <div>{{ status2Filter(scope.row) }}</div>
           </template>

src/views/supply/retail/retail_list.vue

@@ -64,6 +64,7 @@
                 <el-input v-model="screenForm.shMan" placeholder="请输入审核人"></el-input>
               </el-form-item>
             </el-col>
+
             <!-- <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="业务员" prop="salesMan">
                 <el-select v-model="screenForm.salesMan" placeholder="选择业务员" clearable filterable style="width: 100%">
@@ -185,7 +186,14 @@
               </template>
             </el-table-column>
             <el-table-column align="left" label="计量单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-            <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
+           <el-table-column
+              align="left"
+              label="文件编号"
+              prop="fileNo"
+              min-width="100"
+              show-overflow-tooltip
+            />
+           <el-table-column align="left" label="是否直调" prop="isDirectTransfer" min-width="100" show-overflow-tooltip>
               <template slot-scope="scope">
                 {{scope.row.isDirectTransfer ? '是':'否'}}
               </template>

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

@@ -64,7 +64,23 @@
           <el-table-column align="center" label="产品名称" prop="materialName" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="规格型号" prop="specification" min-width="160" show-overflow-tooltip></el-table-column>
           <el-table-column align="center" label="单位" prop="unit" min-width="100" show-overflow-tooltip></el-table-column>
-          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip></el-table-column>
+          <el-table-column align="right" label="数量" prop="refundableQty" min-width="100" show-overflow-tooltip>
+
+            <template slot-scope="scope">
+                  <template v-if="edit">
+                   <el-input
+                        size="mini"
+                    class="input"
+                    v-model="scope.row.refundableQty"
+                      placeholder="请输入数量"
+              ></el-input>
+              </template>
+                 <template v-else>
+                  {{scope.row.refundableQty}}
+                 </template>
+            </template>
+
+          </el-table-column>
           <el-table-column align="right" label="单价" prop="price" min-width="100" show-overflow-tooltip>
             <template slot-scope="scope">
               {{ scope.row.price | numToFixed }}
@@ -75,10 +91,13 @@
               {{ scope.row.payAmount | numToFixed }}
             </template>
           </el-table-column>
-          <el-table-column align="left" label="订单备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column>
+          <el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip></el-table-column>
+          <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
           <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip></el-table-column>
-          <el-table-column align="left" label="业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
+
+                  <el-table-column align="left" label="表头业务员" prop="k3ServiceName" min-width="100" show-overflow-tooltip></el-table-column>
+
+         <el-table-column align="left" label="表体业务员" prop="serviceName" min-width="100" show-overflow-tooltip></el-table-column>
         </el-table>
       </div>
 
@@ -107,19 +126,20 @@
       </div>
     </div>
 
-
-
+    <div style="margin:10px" v-if="edit">
+    <el-button type="primary" @click="updateNum">保存</el-button>
+</div>
   </div>
 </template>
 
 <script>
 import print from 'vue-print-nb'
-import { getDetail } from "@/api/supply/sales";
+import { getDetail ,updateNum} from "@/api/supply/sales";
 
 export default {
   name: 'SalesDetail',
   componentName: 'SalesDetail',
-  props: ['listItem'],
+  props: ['listItem','edit'],
   directives: {
     print
   },
@@ -152,8 +172,23 @@ export default {
     // 返回列表
     goBack() {
       this.$emit('backListFormDetail');
+       this.$parent.edit = false
     },
+     updateNum(){
+      this.detailData.saleOrderData.forEach(item => {
+          item.invoiceNum = +item.refundableQty
+      });
+      updateNum({
+        ...this.detailData
+      }).then(res=>{
+        this.$successMsg("修改成功");
+        this.$parent.edit = false
+         this.goBack();
+        this.$parent.getList();
+      })
+
 
+    },
     // 获取详情
     getDetail() {
       getDetail({id: this.listItem.id}).then(res => {
@@ -174,5 +209,13 @@ export default {
   .detail-container {
     width: 100%;
     height: 100%;
+   .input{
+    ::v-deep .el-input__inner{
+ text-align: right !important;
+    }
+
+  }
   }
+
+
 </style>

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

@@ -88,11 +88,24 @@
             </el-select>
           </template>
         </el-table-column>
-        <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
+        <!-- <el-table-column align="left" label="备注" prop="remark" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-input v-model="scope.row.remark" size="small"></el-input>
           </template>
-        </el-table-column>
+        </el-table-column> -->
+
+<el-table-column align="left" label="表头备注" prop="headerRemark" min-width="160" show-overflow-tooltip>
+   <template slot-scope="scope">
+            <el-input v-model="scope.row.headerRemark" size="small"></el-input>
+          </template>
+</el-table-column>
+          <!-- <el-table-column align="left" label="发货申请备注" prop="remark" min-width="160" show-overflow-tooltip></el-table-column> -->
+          <el-table-column align="left" label="表体备注" prop="invoiceRemark" min-width="160" show-overflow-tooltip>
+               <template slot-scope="scope">
+            <el-input v-model="scope.row.invoiceRemark" size="small"></el-input>
+          </template>
+          </el-table-column>
+
         <el-table-column align="center" label="操作" width="100" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" @click="deleteItem(scope.$index)">删除</el-button>

src/views/supply/sales/sales_list.vue

@@ -65,10 +65,10 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
-              <el-form-item label="产品编码" prop="chNum">
+              <el-form-item label="物料编码" prop="chNum">
                 <el-input
                   v-model="screenForm.chNum"
-                  placeholder="请输入产品编码"
+                  placeholder="请输入物料编码"
                 ></el-input>
               </el-form-item>
             </el-col>
@@ -156,28 +156,7 @@
               v-if="$checkBtnRole('examine', $route.meta.roles)"
               >批量审批</el-button
             >
-              <template       v-if="$checkBtnRole('receipt', $route.meta.roles)">
-            <el-date-picker
-              v-model="value1"
-              size="mini"
-              type="daterange"
-               value-format="yyyy-MM-dd HH:mm:ss"
-              range-separator="至"
-              :picker-options="setDisabled"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              style="margin:0 10px"
-            >
-            </el-date-picker>
-            <el-button
-              size="mini"
 
-              type="warning"
-              icon="el-icon-finished"
-              @click="updateReceipt"
-              >更新发票</el-button
-            >
-              </template>
           </div>
           <div class="fr">
             <ExportButton :exUrl="'sale/order/export'" :exParams="exParams" />
@@ -212,7 +191,7 @@
                 {{ scope.row.examineStatus | statusFilter }}
               </template>
             </el-table-column>
-            <el-table-column
+            <!-- <el-table-column
               align="left"
               label="发票号"
               prop="billReceipt"
@@ -222,8 +201,8 @@
               <template slot-scope="scope">
                 {{ scope.row.billReceipt }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </el-table-column> -->
+            <!-- <el-table-column
               align="left"
               label="出库单号"
               prop="id"
@@ -234,13 +213,13 @@
                 <CopyButton :copyText="scope.row.id" />
                 <span>{{ scope.row.id }}</span>
               </template>
-            </el-table-column>
-            <!--            <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>-->
-            <!--              <template slot-scope="scope">-->
-            <!--                <CopyButton :copyText="scope.row.orderNo" />-->
-            <!--                <span>{{scope.row.orderNo}}</span>-->
-            <!--              </template>-->
-            <!--            </el-table-column>-->
+            </el-table-column> -->
+                       <el-table-column align="left" label="发货单号" prop="orderNo" min-width="130" show-overflow-tooltip>
+                          <template slot-scope="scope">
+                           <CopyButton :copyText="scope.row.orderNo" />
+                           <span>{{scope.row.orderNo}}</span>
+                          </template>
+                      </el-table-column>
             <!--            <el-table-column align="left" label="订单号" prop="orderNo" min-width="140" show-overflow-tooltip>-->
             <!--              <template slot-scope="scope">-->
             <!--                <CopyButton :copyText="scope.row.orderType === 'TRADE' ? scope.row.enginOrderNo : scope.row.mainOrderId" />-->
@@ -365,6 +344,10 @@
                 <el-button type="text" @click="toDetail(scope.row)"
                   >详情</el-button
                 >
+                <el-button type="text" v-if="scope.row.type ===2 &&  scope.row.examineStatus!=='OK'"
+                @click="toDetail(scope.row),edit = true"
+                  >编辑</el-button
+                >
                 <el-button
                   type="text"
                   @click="toExamine(scope.row)"
@@ -406,6 +389,8 @@
       </div>
     </div>
 
+
+
     <ExamineDialog
       :isShow.sync="isShowExamineDialog"
       :examineForm.sync="examineForm"
@@ -413,6 +398,7 @@
 
     <SalesDetail
       :listItem="queryItem"
+      :edit ='edit'
       v-if="isShowDetail"
       @backListFormDetail="backList"
     />
@@ -435,7 +421,8 @@ import {
   examineBatch,
   examineJudge,
   getList,
-  updateReceipt,
+  updateNum,
+
 } from "@/api/supply/sales";
 import SalesDetail from "@/views/supply/sales/components/sales_detail";
 import SalesExamine from "@/views/supply/sales/components/sales_examine";
@@ -492,12 +479,15 @@ export default {
         { label: "审核通过", value: "OK" },
         // { label: '审核驳回', value: 'FAIL' },,
       ],
-
+centerDialogVisible:false,
+cid:'',
       queryItem: {},
       isShowDetail: false,
       isShowExamine: false,
       isShowReturnForm: false,
       value1: "",
+      qty:'',
+      edit:false,
       choiceDate: "",
       multipleSelection: [],
       isShowExamineDialog: false,
@@ -585,20 +575,22 @@ export default {
         this.listLoading = false;
       });
     },
+
+
     updateReceipt() {
 
     if (!this.value1) {
       this.$errorMsg('请选择时间')
       return
     }
-      updateReceipt({
-      startTime:this.value1[0],
-      endTime:this.value1[1]
-      }).then(res=>{
-         this.getList();
-        this.$successMsg("已更新");
-         this.value1 = ''
-      })
+      // updateReceipt({
+      // startTime:this.value1[0],
+      // endTime:this.value1[1]
+      // }).then(res=>{
+      //    this.getList();
+      //   this.$successMsg("已更新");
+      //    this.value1 = ''
+      // })
 
     },
     // 提交筛选表单