Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/remitvoucher/index.vue

@@ -2,7 +2,7 @@
 <template>
   <div>
     <basicLayout 
-      ref="basicLayout" 
+      ref="list" 
       formPath="remitvoucher"
       tableName="remitvoucherTable" 
       idName="sa_paybillid" 
@@ -11,7 +11,31 @@
       :detailPath="{
         path:'/remitvoucherDetail'
       }">
-      <div slot="custom"></div>
+      <div slot="custom" style="display:flex">
+        <div class="label_center">
+          <p class="search__label">状态:</p>
+          <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = '';$refs.list.listData()" v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = status;$refs.list.listData()">
+            <el-option label="新建" value="新建" />
+            <el-option label="提交" value="提交" />
+            <el-option label="审核" value="审核" />
+          </el-select>
+        </div>
+        <div  class="label_center">
+        <label class="search__label">创建时间:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
+      </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span style="color:#333333" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -32,11 +56,22 @@
 export default {
   data () {
     return {
-      options:[]
-      
+      options:[],
+      status:'',
+      dateSelect:'',
     }
   },
   methods:{
+    selectChange(){
+      if (this.dateSelect !== '' && this.dateSelect !== null){
+        this.$refs.list.param.content.where.startdate = this.dateSelect[0]
+        this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+      }else {
+        this.$refs.list.param.content.where.startdate = ''
+        this.$refs.list.param.content.where.enddate = ''
+      }
+      this.$refs.list.listData()
+    },
   }
 }
 

src/HDrpManagement/toolBill/components/add.vue

@@ -83,7 +83,7 @@ export default {
         enterprisename:[
           { required: true, message: '请选择经销商', trigger: 'change'},
         ],
-        sa_orderid:[
+        sonum:[
           { required: true, message: '请选择订单', trigger: 'change'}
         ],
         billdate:[

src/HDrpManagement/toolBill/components/edit.vue

@@ -85,7 +85,7 @@ export default {
         enterprisename:[
           { required: true, message: '请选择经销商', trigger: 'change'},
         ],
-        sa_orderid:[
+        sonum:[
           { required: true, message: '请选择订单', trigger: 'change'}
         ],
         billdate:[

src/HDrpManagement/toolBill/index.vue

@@ -16,13 +16,21 @@
       }"
       @listCreate="listCreate">
       <div slot="custom" style="display:flex">
-        <!-- <div class="label_center">
-          <p class="search__label">类型:</p>
-          <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.type = '';$refs.list.listData()" v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择类型" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.type = type;$refs.list.listData()">
-            <el-option label="退货单" value="退货单" />
-            <el-option label="借用归还单" value="借用归还单" />
-          </el-select>
-        </div> -->
+        <div  class="label_center">
+        <label class="search__label">创建时间:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
         <div class="label_center">
           <p class="search__label">状态:</p>
           <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = '';$refs.list.listData()" v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = status;$refs.list.listData()">
@@ -59,6 +67,7 @@ export default {
     return {
       options:[],
       status:'',
+      dateSelect:'',
       type:'借用归还单'
       
     }
@@ -66,7 +75,17 @@ export default {
   methods:{
     listCreate (param) {
       param.content.type = this.type
-    }
+    },
+    selectChange(){
+      if (this.dateSelect !== '' && this.dateSelect !== null){
+        this.$refs.list.param.content.where.startdate = this.dateSelect[0]
+        this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+      }else {
+        this.$refs.list.param.content.where.startdate = ''
+        this.$refs.list.param.content.where.enddate = ''
+      }
+      this.$refs.list.listData()
+    },
   }
 }
 

src/HDrpManagement/toolBill/modules/productDetail/index.vue

@@ -18,11 +18,7 @@
     <div style="margin-top: 15px">
       <tableLayout :layout="tablecols" :data="list" :opwidth="200"  :custom="true" :width="false"  :height="tableHieght" fixedName="operation">
         <template v-slot:customcol="scope">
-          <div v-if="scope.column.columnname == 'price'">
-            <el-input size="small" v-if="currentProduct.sa_aftersalesmag_itemsid == scope.column.data.sa_aftersalesmag_itemsid" v-model="scope.column.data.price"></el-input>
-            <span v-else>{{scope.column.data.price}}</span>
-          </div>
-          <div v-else-if="scope.column.columnname == 'qty'">
+          <div v-if="scope.column.columnname == 'qty'">
             <el-input size="small" v-if="currentProduct.sa_aftersalesmag_itemsid == scope.column.data.sa_aftersalesmag_itemsid" v-model="scope.column.data.qty"></el-input>
             <span v-else>{{scope.column.data.qty}}</span>
           </div>

src/HDrpManagement/toolBillMag/index.vue

@@ -17,13 +17,6 @@
       @listData="list"
       @listCreate="listCreate">
       <div slot="custom" style="display:flex">
-        <!-- <div class="label_center">
-          <p class="search__label">类型:</p>
-          <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.type = '';$refs.list.listData()" v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择类型" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.type = type;$refs.list.listData()">
-            <el-option label="退货单" value="退货单" />
-            <el-option label="借用归还单" value="借用归还单" />
-          </el-select>
-        </div> -->
         <div class="label_center">
           <p class="search__label">状态:</p>
           <el-select @clear="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = '';$refs.list.listData()" v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择状态" @change="$refs.list.param.content.pageNumber = 1 ;$refs.list.param.content.where.status = status;$refs.list.listData()">
@@ -33,6 +26,21 @@
             <el-option label="复核" value="复核" />
           </el-select>
         </div>
+        <div  class="label_center">
+        <label class="search__label">创建时间:</label>
+          <el-date-picker
+              style="margin-right: 24px !important;"
+              size="small"
+              @change="selectChange"
+              value-format="yyyy-MM-dd"
+              v-model="dateSelect"
+              type="daterange"
+              range-separator="至"
+              start-placeholder="开始日期"
+              end-placeholder="结束日期"
+              clearable>
+          </el-date-picker>
+        </div>
       </div>
       <template v-slot:tbList="scope">
         <span v-if="scope.data.column.columnname == 'status'">
@@ -61,6 +69,7 @@ export default {
     return {
       options:[],
       status:'',
+      dateSelect:'',
       type:'借用归还单'
     }
   },
@@ -71,7 +80,17 @@ export default {
     },
     listCreate (param) {
       param.content.type = this.type
-    }
+    },
+    selectChange(){
+      if (this.dateSelect !== '' && this.dateSelect !== null){
+        this.$refs.list.param.content.where.startdate = this.dateSelect[0]
+        this.$refs.list.param.content.where.enddate = this.dateSelect[1]
+      }else {
+        this.$refs.list.param.content.where.startdate = ''
+        this.$refs.list.param.content.where.enddate = ''
+      }
+      this.$refs.list.listData()
+    },
   }
 }