Merge branch 'sit'

src/assets/js/btnList.js

@@ -85,6 +85,7 @@ const btnList = [
   { code: "084", name: "BOSS审批" },
   { code: "085", name: "批量关联库存" },
   { code: "086", name: "订单导入" },
+  { code: "087", name: "导出" },
 
 ];
 export default btnList;

src/views/purchaseIn/purchaseOrder/index.vue

@@ -146,13 +146,6 @@
                     <el-option label="采购供应商编号" value="7"></el-option>
                   </el-select>
                 </el-input>
-              </el-col>
-               <!-- 暂时注释，下版需要导出 -->
-               <el-col :span="4" style="width: 66px; float: right">
-               
-                <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
-                    导出
-                </el-button>
               </el-col>
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
@@ -164,9 +157,24 @@
                   重置
                 </el-button>
               </el-col>
-              
-                
-        
+              <!-- 暂时注释，下版需要导出 -->
+              <el-col
+                :span="4"
+                style="width: 66px; float: right"
+                v-if="
+                  powers && powers.length > 0 && powers.some((item) => item == '087')
+                "
+              >
+                <el-button
+                  type="primary"
+                  style="margin-left: 30px"
+                  @click="download"
+                  :size="searchSize"
+                  class="fr"
+                >
+                  导出
+                </el-button>
+              </el-col>
               
             </el-row>
           </div>
@@ -321,21 +329,20 @@ export default {
       //选中的数组集合
       this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
-    //导出文件 
+    //导出文件
     async download() {
-      if(this.changeList.length<=0){
-        this.$message.warning("请选择有效数据")
+      if (this.changeList.length <= 0) {
+        this.$message.warning("请选择有效数据");
         return;
       }
       let model = {
-        cgdNos:[]
-      }
-      this.changeList.forEach(item => {
-        model.cgdNos.push(item.cgdNo)
+        cgdNos: [],
+      };
+      this.changeList.forEach((item) => {
+        model.cgdNos.push(item.cgdNo);
       });
-      
-      // const res = await asyncRequest.exportcgdlist(model)
 
+      // const res = await asyncRequest.exportcgdlist(model)
 
       if (!this.loading) {
         this.loading = true;
@@ -359,7 +366,7 @@ export default {
               let url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType
+                  type: httpType,
                 })
               );
               let link = document.createElement("a");

src/views/reportQuery/purchaseReport/components/table14.vue

@@ -25,12 +25,12 @@
           <div style="width: 100%">
             <el-row style="padding: 0 0 0 80px">
              
-               <el-col :span="6" style="width: 363px;">
+               <el-col :span="6" style="width: 403px;">
                 <periodDatePickerActive
                       :start="parmValue.start_date"
                       :end="parmValue.end_date"
-                      :placeholder="'咨询'"
-                      :width="'165px'"
+                      :placeholder="'出入库'"
+                      :width="'175px'"
                       :size="searchSize"
                       @timeReturned="time"
                     />
@@ -50,43 +50,38 @@
                   刷新
                 </el-button>
               </el-col>
-              <el-col :span="4" style="width: 66px; float: right">
-                <el-button
-                  type="warning"
-                  class="fr"
+              
+            </el-row>
+            <el-row style="padding: 10px 0 0 0" gutter="10">
+              <el-col :span="6" style="width: 240px">
+                <el-input
+                  clearable
+                  placeholder="采购维护人"
+                  v-model="parmValue.xiugai1"
+                  maxlength="40"
                   :size="searchSize"
-                  @click="restSearch"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
                 >
-                  重置
-                </el-button>
-              </el-col>  
-            </el-row>
-            <!-- <el-row style="padding: 10px 0 0 0">
-              
-              <el-col :span="6" style="width: 363px;">
-                <periodDatePickerActive
-                      :start="parmValue.start_date"
-                      :end="parmValue.end_date"
-                      :placeholder="'导入'"
-                      :width="'165px'"
-                      :size="searchSize"
-                      @timeReturned="time"
-                    />
-              </el-col>  
-              <el-col :span="4" style="width: 66px; float: right">       
-                <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
-                    导出
-                </el-button>
+                </el-input>
               </el-col>
-              <el-col :span="3" style="width: 66px; float: right">
-                <el-button
+              <el-col :span="6" style="width: 240px">
+                <el-input
+                  clearable
+                  placeholder="供应商名称"
+                  v-model="parmValue.xiugai2"
+                  maxlength="40"
                   :size="searchSize"
-                  type="primary"
-                  style="float: right; margin-left: 5px"
-                  @click="searchList"
+                  @blur="
+                    pageInfo.curr = 1;
+                    parmValue.page = 1;
+                    searchList();
+                  "
                 >
-                  刷新
-                </el-button>
+                </el-input>
               </el-col>
               <el-col :span="4" style="width: 66px; float: right">
                 <el-button
@@ -98,7 +93,7 @@
                   重置
                 </el-button>
               </el-col>     
-            </el-row> -->
+            </el-row>
           </div>
        </template>
 
@@ -137,10 +132,10 @@ export default {
       loading: false,
       //请求参数集合
       parmValue: {
-        
+        xiugai1:"", //咨询订单号
+        xiugai2:"",
         start_date: "", //起始时间
         end_date: "", // 结束时间
-
         page: 1, // 页码
         size: 15, // 每页显示条数
        

src/views/sellOut/sellOutOrder/index.vue

@@ -113,13 +113,6 @@
                   ></el-button>
                 </el-input>
               </el-col>
-              <!-- 暂时注释，下版需要导出 -->
-               <el-col :span="4" style="width: 66px; float: right">
-               
-                <el-button type="primary" style="margin-left:30px;" @click="download" :size="searchSize"  class="fr">
-                    导出
-                </el-button>
-              </el-col>
               <el-col :span="4" style="width: 66px" class="fr">
                 <el-button
                   type="warning"
@@ -130,6 +123,25 @@
                   重置
                 </el-button>
               </el-col>
+              <!-- 暂时注释，下版需要导出 -->
+              <el-col
+                :span="4"
+                style="width: 66px; float: right"
+                v-if="
+                  powers && powers.length > 0 && powers.some((item) => item == '087')
+                "
+              >
+                <el-button
+                  type="primary"
+                  style="margin-left: 30px"
+                  @click="download"
+                  :size="searchSize"
+                  class="fr"
+                >
+                  导出
+                </el-button>
+              </el-col>
+              
             </el-row>
           </div>
         </template>
@@ -291,23 +303,21 @@ export default {
       //选中的数组集合
       this.changeList = list.length > 0 ? JSON.parse(JSON.stringify(list)) : [];
     },
-    //导出文件 （需修改接口，现在的接口是导出采购单的接口）
+    //导出文件 （）
     async download() {
-      if(this.changeList.length<=0){
-        this.$message.warning("请选择有效数据")
+      if (this.changeList.length <= 0) {
+        this.$message.warning("请选择有效数据");
         return;
       }
 
-      //需修改，现在的model是采购的字段
       let model = {
-        outCodes:[]
-      }
-      this.changeList.forEach(item => {
-        model.outCodes.push(item.outCode)
+        outCodes: [],
+      };
+      this.changeList.forEach((item) => {
+        model.outCodes.push(item.outCode);
       });
-      
-      // const res = await asyncRequest.exportcgdlist(model)
 
+      // const res = await asyncRequest.exportcgdlist(model)
 
       if (!this.loading) {
         this.loading = true;
@@ -331,7 +341,7 @@ export default {
               let url = window.URL.createObjectURL(
                 new Blob([res.data], {
                   // type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8",
-                  type: httpType
+                  type: httpType,
                 })
               );
               let link = document.createElement("a");