Merge tag 'Hotfix-zh-261' into develop

Finish Hotfix-zh-261

src/views/supply/deliver/commerce_list.vue

@@ -222,8 +222,8 @@
             <el-table-column align="center" label="操作" width="200" fixed="right">
               <template slot-scope="scope">
                 <el-button type="text" @click="toDetail(scope.row)">详情</el-button>
-                <el-button type="text" @click="getPassword(scope.row.id)">获取密码</el-button>
-                <el-button type="text" @click="openShareDetail(scope.row.id)">密码记录</el-button>
+                <el-button type="text" v-if="!isDealer" @click="getPassword(scope.row.id)">获取密码</el-button>
+                <el-button type="text" v-if="!isDealer" @click="openShareDetail(scope.row.id)">密码记录</el-button>
               </template>
             </el-table-column>
           </el-table>
@@ -346,6 +346,9 @@ export default {
     isShowDetail() {
       return this.queryItem.hasOwnProperty('id');
     },
+    isDealer() {
+      return JSON.parse(localStorage.getItem("supply_user")).isCustomer
+    },
   },
 
   beforeCreate() {

src/views/supply/implement/nsales_list.vue

@@ -82,6 +82,35 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="打印日期" prop="printTime">
+                <el-date-picker
+                  v-model="screenForm.printTime"
+                  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="printDesc">
+                  <el-select v-model="screenForm.printDesc"  clearable filterable >
+                    <el-option
+                      label="默认"
+                      :value="null">
+                    </el-option>
+                    <el-option
+                      label="倒叙"
+                      :value="1">
+                    </el-option>
+                  </el-select>
+
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
               <el-form-item label="出库单号" prop="id">
                 <el-input
                   v-model="screenForm.id"
@@ -89,7 +118,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6" class="tr">
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm">搜索</el-button>
@@ -106,7 +135,7 @@
             <!-- <el-button size="mini" type="warning" icon="el-icon-finished" @click="batchExamine" :disabled="multipleSelection.length < 1" v-if="$checkBtnRole('examine', $route.meta.roles)">批量审批</el-button>-->
           </div>
           <div class="fr">
-            <ExportButton :exUrl="'sale/order/export'" :exParams="exParams" />
+            <ExportButton :exUrl="'sale/order/exportChuku'" :exParams="exParams" />
           </div>
         </div>
         <div class="table">
@@ -305,7 +334,9 @@ export default {
         date: '',
         status: '',
         approval:'',
+        printTime:'',
         mainOrderId: '',
+        printDesc:null,
         id:''
       },
       statusList: [
@@ -373,7 +404,14 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
          approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
         approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
+          printStartTime:this.screenForm.printTime
+          ? this.screenForm.printTime[0]
+          : "",
+          printEndtTime:this.screenForm.printTime
+          ? this.screenForm.printTime[1]
+          : "",
         mainOrderId: this.screenForm.mainOrderId,
+        printTimeDesc:this.screenForm.printDesc,
         id:this.screenForm.id
       }
     },
@@ -407,6 +445,13 @@ export default {
         endTime: this.screenForm.date ? this.screenForm.date[1] : '',
          approvalStartTime: this.screenForm.approval ? this.screenForm.approval[0] : "",
         approvalEndTime: this.screenForm.approval ? this.screenForm.approval[1] : "",
+          printStartTime:this.screenForm.printTime
+          ? this.screenForm.printTime[0]
+          : "",
+          printEndtTime:this.screenForm.printTime
+          ? this.screenForm.printTime[1]
+          : "",
+          printTimeDesc:this.screenForm.printDesc,
         mainOrderId: this.screenForm.mainOrderId,
         id:this.screenForm.id
       };

src/views/supply/sales/sales_list.vue

@@ -129,6 +129,35 @@
               </el-form-item>
             </el-col>
             <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="时间排序" prop="printDesc">
+                  <el-select v-model="screenForm.printDesc"  clearable filterable >
+                    <el-option
+                      label="默认"
+                      :value="null">
+                    </el-option>
+                    <el-option
+                      label="倒叙"
+                      :value="1">
+                    </el-option>
+                  </el-select>
+
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="打印日期" prop="printTime">
+                <el-date-picker
+                  v-model="screenForm.printTime"
+                  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="id">
                 <el-input
                   v-model="screenForm.id"
@@ -136,7 +165,7 @@
                 ></el-input>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="12" :lg="6" class="tr">
+            <el-col :xs="24" :sm="12" :lg="18" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm"
@@ -523,6 +552,8 @@ export default {
         status: "",
         mainOrderId: "",
         approval: "",
+        printTime:'',
+        printDesc:null,
         id: "",
       },
       statusList: [
@@ -599,7 +630,14 @@ export default {
         approvalEndTime: this.screenForm.approval
           ? this.screenForm.approval[1]
           : "",
+          printStartTime:this.screenForm.printTime
+          ? this.screenForm.printTime[0]
+          : "",
+          printEndtTime:this.screenForm.printTime
+          ? this.screenForm.printTime[1]
+          : "",
         mainOrderId: this.screenForm.mainOrderId,
+        printTimeDesc:this.screenForm.printDesc,
         id: this.screenForm.id.replace(/，/gi, ","),
       };
     },
@@ -650,6 +688,13 @@ export default {
           ? this.screenForm.approval[1]
           : "",
         mainOrderId: this.screenForm.mainOrderId,
+          printStartTime:this.screenForm.printTime
+          ? this.screenForm.printTime[0]
+          : "",
+          printEndtTime:this.screenForm.printTime
+          ? this.screenForm.printTime[1]
+          : "",
+          printTimeDesc:this.screenForm.printDesc,
         id: this.screenForm.id.replace(/，/gi, ","),
       };
       getList(params).then((res) => {