Merge branch 'master' of https://gitee.com/vansfa/rt_adminUI

src/views/store/components/productOrder.vue

@@ -159,7 +159,7 @@
         </span>
       </div>
       <el-image 
-          v-if="certificates != ''"
+          v-if="certificates != null"
           :src="certificates"
           :preview-src-list="[certificates]"
           :style="{ width: '100px', height: '100px' }"
@@ -484,7 +484,7 @@ export default {
       orderTypeOptions:[],
       payTypeOptions:[],
       statusOptions:[],
-      certificates:'',
+      certificates:null,
       orderStatus:null,
       order:null,
       user:{},
@@ -714,6 +714,7 @@ export default {
     },
     getOrder(orderId){
         this.orderId=orderId;
+        this.certificates = null;
         getStoreOrder(orderId).then(response => {
             this.order = response.order;
             if(response.order.certificates != null){

src/views/store/storeOrder/healthStoreList.vue

@@ -86,6 +86,12 @@
               />
         </el-select>
       </el-form-item>
+      <el-form-item label="上传凭证" prop="isUpload">
+         <el-select   v-model="queryParams.isUpload" placeholder="请选择" clearable size="small" >
+          <el-option key="0"  label="未上传" value="0" />
+             <el-option key="1"  label="已上传" value="1" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="物流状态" prop="deliveryStatus">
          <el-select   v-model="queryParams.deliveryStatus" placeholder="请选择物流状态" clearable size="small" >
          <el-option

src/views/store/storeOrder/index.vue

@@ -83,6 +83,14 @@
               />
         </el-select>
       </el-form-item>
+      <el-form-item label="上传凭证" prop="isUpload">
+         <el-select   v-model="queryParams.isUpload" placeholder="请选择" clearable size="small" >
+          <el-option key="0"  label="未上传" value="0" />
+             <el-option key="1"  label="已上传" value="1" />
+        </el-select>
+      </el-form-item>
+
+      
 
       <el-form-item label="物流状态" prop="deliveryStatus">
          <el-select   v-model="queryParams.deliveryStatus" placeholder="请选择物流状态" clearable size="small" >
@@ -592,6 +600,7 @@ export default {
         isRemind: null,
         isSysDel: null,
         deptId:null,
+        isUpload:null,
      
       },
       // 表单参数

src/views/store/storePayment/index.vue

@@ -83,12 +83,15 @@
         />
       </el-form-item>
 
-      <el-form-item label="提交时间" prop="createTime">
-        <el-date-picker clearable size="small" style="width: 205.4px"
-          v-model="queryParams.createTime"
-          type="date"
+      <el-form-item label="提交时间" prop="createTimeRange">
+        <el-date-picker
+          style="width:205.4px"
+          clearable size="small"
+          v-model="createTimeRange"
+          type="daterange"
           value-format="yyyy-MM-dd"
-          placeholder="选择提交时间">
+          start-placeholder="开始日期"
+          end-placeholder="结束日期">
         </el-date-picker>
       </el-form-item>
 
@@ -266,6 +269,7 @@ export default {
       },
       companys:[],
       statusOptions:[],
+      createTimeRange:[],
       showLoading:false,
       // 遮罩层
       loading: true,
@@ -365,6 +369,12 @@ export default {
     /** 查询支付明细列表 */
     getList() {
       this.loading = true;
+      if(this.createTimeRange!=null&&this.createTimeRange.length==2){
+        this.queryParams.createTimeRange=this.createTimeRange[0]+"--"+this.createTimeRange[1]
+      }
+      else{
+        this.queryParams.createTimeRange=null;
+      }
       listStorePayment(this.addDateRange(this.queryParams, this.dateRange),this.refundDateRange).then(response => {
         this.storePaymentList = response.rows;
         this.total = response.total;

src/views/store/storeProductPackage/index.vue

@@ -234,7 +234,7 @@
                 <el-table-column label="数量" align="center"  prop="count" width="200px" >
                    <template slot-scope="scope">
                     <div>
-                        <el-input-number v-model="scope.row.count"  @change="handleProductCountChange(scope.row)"  size="mini" :min="1" :max="scope.row.stock"  ></el-input-number>
+                        <el-input-number v-model="scope.row.count"  @change="handleProductCountChange(scope.row)"  size="mini" :min="1"   ></el-input-number>
                     </div>
                   </template>
                 </el-table-column>