Merge branch 'dev_bug' into develop

src/api/stock.js

@@ -203,4 +203,40 @@ export function workerTemplateExcel(data, name) {
     data,
     name
   });
+}
+
+
+
+
+// 出库条码管理列表
+export function getSalseList(params) {
+  return request({
+    url: `/sale/code/list?moduleId=${params.moduleId}`,
+    method: 'post',
+    data: params
+  })
+}
+
+// 下载模板
+export function salseCodeDownload(data, name) {
+  return getBlob({
+    url: "/sale/code/download",
+    data,
+    name
+  });
+}
+
+// 导入
+export function salseImport(data) {
+  return handleImport("/sale/code/importData", data.formdata, data.id || "");
+}
+
+
+// 出库条码管理导出
+export function salseExport(data, name) {
+  return postBlob({
+    url: '/sale/code/list/export',
+    data,
+    name
+  })
 }

src/views/deposit_commerce/refund_list.vue

@@ -839,7 +839,7 @@ export default {
       this.examine = v
       this.getDataList({
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: 1,
         enginOrderType: this.enginOrderType,
         ...this.screenForm,
         examineStatus: this.examine
@@ -872,7 +872,7 @@ export default {
     searchFn() {
       this.getDataList({
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: 1,
         confirmName: '',
         createName: '',
         enginOrderNo: '',

src/views/deposit_home/components/deposit_replenish.vue

@@ -361,7 +361,7 @@
                         <div class="value">
                             <template v-if="
                                 !(
-                        details.examineStatus == 'WAIT' ||
+                                    details.examineStatus == 'WAIT' ||
                                     details.examineStatus == 'SAVE' ||
                                     details.examineStatus == 'CLOSE'
                                 )
@@ -386,114 +386,124 @@
                 </el-row>
             </div>
             <h3>补充资料</h3>
-                        <el-divider />
-            <div
-          v-if=" details.examineStatus == 'AMEND'">
-       
-          <div class="mymain-container">
-            <div class="table">
-              <el-table v-loading="listLoading" :data="amendData" element-loading-text="Loading" border fit
-                highlight-current-row stripe>
-                <el-table-column align="left" label="资料描述" prop="dataDescribe" min-width="160" show-overflow-tooltip />
-                <el-table-column align="left" label="原文件名" prop="fileName" min-width="160" show-overflow-tooltip />
-                <el-table-column align="left" label="缩略图" prop="fileUrl" min-width="160" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <el-image v-if="checkFileType(scope.row.fileUrl) == 'image'" ref="img"
-                      :src="imageURL + scope.row.fileUrl" style="width: 120px; height: 120px" fit="cover"
-                      :preview-src-list="[imageURL + scope.row.fileUrl]" />
-                    <img v-if="checkFileType(scope.row.fileUrl) == 'word'" class="file"
-                      src="@/assets/common/word.png" />
-                    <img v-if="checkFileType(scope.row.fileUrl) == 'excel'" class="file"
-                      src="@/assets/common/excel.png" />
-                    <img v-if="checkFileType(scope.row.fileUrl) == 'ppt'" class="file" src="@/assets/common/ppt.png" />
-                    <img v-if="checkFileType(scope.row.fileUrl) == 'pdf'" class="file" src="@/assets/common/pdf.png" />
-                    <img v-if="checkFileType(scope.row.fileUrl) == 'file'" class="file aaa"
-                      src="@/assets/common/zip.jpeg" />
-                  </template>
-                </el-table-column>
-                <el-table-column align="left" label="下载文件名称" prop="fileName" min-width="160" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    {{ '资料_' + scope.row.fileName }}
-                  </template>
-                </el-table-column>
-                <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
-                  <template slot-scope="scope">
-                    <el-button type="text" class="textColor"
-                      @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)">下载</el-button>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
-            <div class="diy-table-1">
-              <el-row :gutter="0">
-                <el-col :xs="12" :sm="12" :lg="12" class="item">
-                  <div class="label">
-                    上传人
-                  </div>
-                  <div class="value">
-                    {{ details.amendBy }}
-                  </div>
-                </el-col>
-                <el-col :xs="12" :sm="12" :lg="12" class="item">
-                  <div class="label">
-                    上传时间
-                  </div>
-                  <div class="value">
-                    {{ details.amendTime }}
-                  </div>
-                </el-col>
-                <el-col :xs="12" :sm="24" :lg="24" class="item">
-                  <div class="label">
-                    补充说明
-                  </div>
-                  <div class="value">
-                    {{ details.amendRemark }}
-                  </div>
-                </el-col>
+            <el-divider />
+            <div v-if="details.examineStatus == 'AMEND'">
 
-              </el-row>
-            </div>
-            <div v-if="details.examineStatus == 'REVIEW'">
-              <h3 class="gdzl">复核</h3>
-              <el-divider />
-              <div class="diy-table-1">
-                <el-row :gutter="0">
-                  <el-col :xs="12" :sm="12" :lg="12" class="item">
-                    <div class="label">
-                      复核人
-                    </div>
-                    <div class="value">
-                      <el-input v-model="details.reviewBy" placeholder="请输入" />
+                <div class="mymain-container">
+                    <div class="table">
+                        <el-table v-loading="listLoading" :data="amendData" element-loading-text="Loading" border fit
+                            highlight-current-row stripe>
+                            <el-table-column align="left" label="资料描述" prop="dataDescribe" min-width="160"
+                                show-overflow-tooltip />
+                            <el-table-column align="left" label="原文件名" prop="fileName" min-width="160"
+                                show-overflow-tooltip />
+                            <el-table-column align="left" label="缩略图" prop="fileUrl" min-width="160"
+                                show-overflow-tooltip>
+                                <template slot-scope="scope">
+                                    <el-image v-if="checkFileType(scope.row.fileUrl) == 'image'" ref="img"
+                                        :src="imageURL + scope.row.fileUrl" style="width: 120px; height: 120px"
+                                        fit="cover" :preview-src-list="[imageURL + scope.row.fileUrl]" />
+                                    <img v-if="checkFileType(scope.row.fileUrl) == 'word'" class="file"
+                                        src="@/assets/common/word.png" />
+                                    <img v-if="checkFileType(scope.row.fileUrl) == 'excel'" class="file"
+                                        src="@/assets/common/excel.png" />
+                                    <img v-if="checkFileType(scope.row.fileUrl) == 'ppt'" class="file"
+                                        src="@/assets/common/ppt.png" />
+                                    <img v-if="checkFileType(scope.row.fileUrl) == 'pdf'" class="file"
+                                        src="@/assets/common/pdf.png" />
+                                    <img v-if="checkFileType(scope.row.fileUrl) == 'file'" class="file aaa"
+                                        src="@/assets/common/zip.jpeg" />
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="left" label="下载文件名称" prop="fileName" min-width="160"
+                                show-overflow-tooltip>
+                                <template slot-scope="scope">
+                                    {{ '资料_' + scope.row.fileName }}
+                                </template>
+                            </el-table-column>
+                            <el-table-column align="center" label="操作" min-width="160" show-overflow-tooltip>
+                                <template slot-scope="scope">
+                                    <el-button type="text" class="textColor"
+                                        @click="downLoadFn(scope.row.fileUrl, scope.row.fileName)">下载</el-button>
+                                    <el-popconfirm style="margin-left: 10px" title="这是一段内容确定删除吗？"
+                                        @onConfirm="delFile(scope.$index,scope.row.id)">
+                                        <el-button type="text" slot="reference">删除</el-button>
+                                    </el-popconfirm>
+                                </template>
+                            </el-table-column>
+                        </el-table>
                     </div>
-                  </el-col>
-                  <el-col :xs="12" :sm="12" :lg="12" class="item">
-                    <div class="label">
-                      复核时间
-                    </div>
-                    <div class="value">
-                      <el-date-picker v-model="details.reviewTime" class="dateStyle" type="datetime" placeholder="选择日期"
-                        default-time="00:00:00" value-format="yyyy-MM-dd HH:mm:ss" />
-                    </div>
-                  </el-col>
-                  <el-col :xs="12" :sm="24" :lg="24" class="item">
-                    <div class="label">
-                      复核说明
-                    </div>
-                    <div class="value">
-                      <input v-model="details.reviewRemark" type="text" />
+                    <div class="diy-table-1">
+                        <el-row :gutter="0">
+                            <el-col :xs="12" :sm="12" :lg="12" class="item">
+                                <div class="label">
+                                    上传人
+                                </div>
+                                <div class="value">
+                                    {{ details.amendBy }}
+                                </div>
+                            </el-col>
+                            <el-col :xs="12" :sm="12" :lg="12" class="item">
+                                <div class="label">
+                                    上传时间
+                                </div>
+                                <div class="value">
+                                    {{ details.amendTime }}
+                                </div>
+                            </el-col>
+                            <el-col :xs="12" :sm="24" :lg="24" class="item">
+                                <div class="label">
+                                    补充说明
+                                </div>
+                                <div class="value">
+                                    {{ details.amendRemark }}
+                                </div>
+                            </el-col>
+
+                        </el-row>
                     </div>
-                  </el-col>
+                    <div v-if="details.examineStatus == 'REVIEW'">
+                        <h3 class="gdzl">复核</h3>
+                        <el-divider />
+                        <div class="diy-table-1">
+                            <el-row :gutter="0">
+                                <el-col :xs="12" :sm="12" :lg="12" class="item">
+                                    <div class="label">
+                                        复核人
+                                    </div>
+                                    <div class="value">
+                                        <el-input v-model="details.reviewBy" placeholder="请输入" />
+                                    </div>
+                                </el-col>
+                                <el-col :xs="12" :sm="12" :lg="12" class="item">
+                                    <div class="label">
+                                        复核时间
+                                    </div>
+                                    <div class="value">
+                                        <el-date-picker v-model="details.reviewTime" class="dateStyle" type="datetime"
+                                            placeholder="选择日期" default-time="00:00:00"
+                                            value-format="yyyy-MM-dd HH:mm:ss" />
+                                    </div>
+                                </el-col>
+                                <el-col :xs="12" :sm="24" :lg="24" class="item">
+                                    <div class="label">
+                                        复核说明
+                                    </div>
+                                    <div class="value">
+                                        <input v-model="details.reviewRemark" type="text" />
+                                    </div>
+                                </el-col>
 
-                </el-row>
-              </div>
+                            </el-row>
+                        </div>
+                    </div>
+                </div>
             </div>
-          </div>
-        </div>
             <div>
                 <div
                     v-if="details.examineStatus == 'OK' || details.examineStatus == 'WAIT_REVIEW' || details.examineStatus == 'AMEND' || details.examineStatus == 'REVIEW'">
                     <div>
-                        
+
                         <!-- 筛选条件 -->
                         <div>
                             <el-form ref="form" :model="details" label-width="100px" size="small" label-position="left">
@@ -838,6 +848,15 @@ export default {
         openPdf(pdfUrl) {
             window.open(this.$imageUrl + pdfUrl)
         },
+        delFile(index,id) {
+            this.amendData.splice(index, 1)
+            this.details.dataList.filter((k, i)=>{
+                if (k.id === id) {
+                    this.details.dataList.splice(i,1)
+                }
+            })
+            this.$successMsg('删除成功')
+        },
         // 检查文件类型
         checkFileType(url) {
             if (!url) return ''
@@ -881,6 +900,7 @@ export default {
             this.fileList = []
         },
         replenishClick() {
+            console.log(this.details.dataList);
             var arr = []
             if (this.fileList.length) {
                 this.fileList.forEach(el => {

src/views/deposit_home/refund_list.vue

@@ -833,7 +833,7 @@ export default {
       this.examine = v
       this.getDataList({
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: 1,
         enginOrderType: this.enginOrderType,
         ...this.screenForm,
         examineStatus: this.examine
@@ -866,7 +866,7 @@ export default {
     searchFn() {
       this.getDataList({
         pageSize: this.pageSize,
-        pageNum: this.currentPage,
+        pageNum: 1,
         confirmName: '',
         createName: '',
         enginOrderNo: '',

src/views/supply/pickup/barcode.vue

@@ -0,0 +1,136 @@
+<template>
+    <div>
+      <template-page
+        style="width: 100%;
+        height: 100%;"
+        ref="pageRef"
+        :getList="getList"
+        :exportList="exportList"
+        :columnParsing="columnParsing"
+        :optionsEvensGroup="optionsEvensGroup"
+      >
+      </template-page>
+    </div>
+  </template>
+  
+  <script>
+  import TemplatePage from '@/components/template/template-page-1.vue'
+  import import_mixin from '@/components/template/import_mixin.js'
+  
+  import { getSalseList, salseExport,salseImport, salseCodeDownload } from '@/api/stock'
+  export default {
+    components: { TemplatePage },
+    mixins: [import_mixin],
+    data() {
+      return {
+        // 事件组合
+        optionsEvensGroup: [
+        [
+            [
+            {
+                name: "下载模板",
+                click: () => {
+                  salseCodeDownload({}, `${this.$route.meta.title}`)
+                    .then(res => {
+                      console.log('chengg');
+                      this.$message({
+                        message: "下载成功",
+                        type: "success"
+                      });
+                    })
+                    .catch(err => {
+                      this.$message.error("下载失败");
+                    });
+                },
+                // isRole: this.$checkBtnRole("import",this.$route.meta.roles)
+              }
+            ]
+          ],
+          [
+            [
+              {
+                name: '',
+                render:this.importButton(salseImport),
+                // isRole: this.$checkBtnRole("import",this.$route.meta.roles)
+              }
+            ]
+          ]
+         
+        ],
+        // 表格属性
+        tableAttributes: {
+          // 启用勾选列
+          selectColumn: true
+        },
+        // 表格事件
+        tableEvents: {
+          'selection-change': this.selectionChange
+        },
+        recordSelected: []
+      }
+    },
+    methods: {
+      // 列表请求函数
+      getList(...p) {
+        this.recordSelected = []
+        return getSalseList(...p)
+      },
+      // 列表导出函数
+      exportList: salseExport,
+      // 表格列解析渲染数据更改
+      columnParsing(item, defaultData) {
+        return defaultData
+      },
+      // 监听勾选变化
+      selectionChange(data) {
+        this.recordSelected = data
+      }
+      // 批量删除
+      // dels() {
+      //   if (this.recordSelected.length) {
+      //     this.$confirm('此操作将删除数据, 是否继续?', '提示', {
+      //       confirmButtonText: '确定',
+      //       cancelButtonText: '取消',
+      //       type: 'warning'
+      //     })
+      //       .then(() => {
+      //         partsOldOutDel({
+      //           ids: this.recordSelected.map(item => item.id).join(',')
+      //         })
+      //           .then(res => {
+      //             this.$refs.pageRef.refreshList()
+      //             this.$message({
+      //               type: 'success',
+      //               message: '删除成功!'
+      //             })
+      //           })
+      //           .catch(() => {
+      //             this.$message({
+      //               type: 'error',
+      //               message: '删除失败'
+      //             })
+      //           })
+      //       })
+      //       .catch(() => {
+      //         this.$message({
+      //           type: 'info',
+      //           message: '已取消删除'
+      //         })
+      //       })
+      //   } else {
+      //     this.$message({
+      //       type: 'info',
+      //       message: '请先勾选需要删除的数据!'
+      //     })
+      //   }
+      // }
+    }
+  }
+  </script>
+  
+  <style lang="scss" scoped>
+  ::v-deep .el-table__body-wrapper {
+    height: 100% !important;
+  }
+  </style>
+