商品组管理、产品技术与资料

src/Form/payvoucher/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
-    <el-button size="mini" type="primary" @click="dialogFormVisible = true">新 建</el-button>
-    <el-dialog title="新 建" :visible.sync="dialogFormVisible" width="500px">
+    <el-button size="mini" type="primary" @click="dialogFormVisible = true" >新 建</el-button>
+    <el-dialog title="新 建" :visible.sync="dialogFormVisible" width="500px" append-to-body>
       <div slot="title" style="font-size: 15px">
         新增支出凭证
       </div>

src/HDrpManagement/ProductGroupMag/components/shelves.vue

@@ -0,0 +1,89 @@
+<template>
+  <div>
+    <el-button size="mini" @click="onshow">{{data.isonsale === 0?'上 架':'下 架'}}</el-button>
+    <el-dialog
+        title="提示"
+        :visible.sync="upVisible"
+        width="25%"
+        append-to-body
+    >
+      <span>确定上架该商品组嘛</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="upVisible = false">取 消</el-button>
+        <el-button type="primary" @click="shelvesUp">确 定</el-button>
+      </span>
+    </el-dialog>
+    <el-dialog
+        title="提示"
+        :visible.sync="downVisible"
+        width="25%"
+        append-to-body
+    >
+      <span>确定下架该商品组嘛</span>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="downVisible = false">取 消</el-button>
+        <el-button type="primary" @click="shelvesDown">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "shelves",
+  props:["data"],
+  data(){
+    return {
+      upVisible:false,
+      downVisible:false
+    }
+  },
+  methods:{
+    onshow(){
+      console.log("输出数据")
+      console.log(this.data)
+      if (this.data.isonsale === 0){
+        this.upVisible = true
+      }else {
+        this.downVisible = true
+      }
+    },
+    async shelvesUp(){
+      const res = await this.$api.requested({
+        "id": "20220923143603",
+        "version":1,
+        "content": {
+          "sa_itemgroupids":[this.data.sa_itemgroupid]
+
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.upVisible = false
+        this.$emit("upSuccess")
+      })
+
+    },
+    async shelvesDown(){
+      const res = await this.$api.requested({
+        "id": "20220923143703",
+        "version":1,
+        "content": {
+          "sa_itemgroupids":[this.data.sa_itemgroupid]
+
+        }
+      })
+      this.tool.showMessage(res,()=>{
+        this.downVisible = false
+        this.$emit("upSuccess")
+      })
+    }
+  },
+  mounted() {
+
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/HDrpManagement/ProductGroupMag/index.vue

@@ -14,10 +14,12 @@
       :detailPath="{path:'/productGroupDetail'}"
       @listData="listData">
       <div slot="custom" style="display:flex">
-        <el-select style="margin-right:10px" @change="selectChange" v-model="selectParam.brandname" placeholder="请选择品牌" size="small" clearable>
+        <label class="search__label " style="margin: auto;width: 35px">品牌:</label>
+        <el-select class="inline-16" @change="selectChange" v-model="selectParam.brandname" placeholder="请选择品牌" size="small" clearable>
           <el-option v-for="item in brandList" :key="item.sa_brandid" :value="item.brandname" :label="item.brandname"></el-option>
         </el-select>
-        <el-select style="margin-right:10px" @change="selectChange" v-model="selectParam.isonsale" placeholder="是否上架" size="small" clearable>
+        <label class="search__label " style="margin: auto;width: 65px;">是否上架:</label>
+        <el-select class="inline-16" @change="selectChange" v-model="selectParam.isonsale" placeholder="是否上架" size="small" clearable>
           <el-option :key="1" :value="1" label="已上架"></el-option>
           <el-option :key="2" :value="0" label="未上架"></el-option>
         </el-select>
@@ -114,5 +116,10 @@ export default {
 </script>
 
 <style scoped>
-
+.search__label{
+  display: inline-block;
+  width: 80px;
+  font-size: 14px;
+  color:rgb(163, 163, 163) !important;
+}
 </style>

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -1,40 +1,48 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="drawer=true">新 建</el-button>
-    <el-drawer title="新增商品组" :visible.sync="drawer" size="50%" direction="rtl" append-to-body>
+    <el-drawer title="创建商品组" :visible.sync="drawer" size="40%" direction="rtl" append-to-body>
       <div class="drawer__panel">
-          <el-row>
-            <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">
-              <el-col :span="24" style="display:flex">
-                <el-form-item label="产品组名称" prop="groupname">
-                  <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
-                </el-form-item>
-                <el-form-item label="品牌" prop="sa_brandid">
-                  <el-select v-model="form.sa_brandid" placeholder="请选择品牌" @change="getProductList(params.content.pageNumber = 1,$refs.table.allArr=[])">
-                    <el-option v-for="item in brandList()" :key="item.sa_brandid" :label="item.brandname"
-                      :value="item.sa_brandid" size="small">
-                    </el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="24">
-                <el-form-item label="商品" prop="itemno">
-                  <Table ref="table" v-model="form.itemno" :layout="tablecols" :data="productList" :custom="false" height="500px" @upDateData="upDateData">
-                  </Table>
-                  <el-pagination
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
+            <el-col :span="12">
+              <el-form-item label="商品组名称:" prop="groupname">
+                <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="品牌:" prop="sa_brandid">
+                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" @change="getProductList(params.content.pageNumber = 1,$refs.table.allArr=[])" style="width: 100%">
+                  <el-option v-for="item in brandList()" :key="item.sa_brandid" :label="item.brandname"
+                             :value="item.sa_brandid" size="small">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" style="margin-bottom: 20px">
+              <label class="inline-16">可选商品</label>
+              <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px" size="small" class="input-with-select inline-16" clearable>
+              </el-input>
+            </el-col>
+            <el-col :span="24">
+              <Table ref="table" v-model="form.itemno" :layout="tablecols" :data="productList" :custom="false" height="500px"  @upDateData="upDateData">
+              </Table>
+              <div class="container normal-panel" style="text-align:right">
+                <el-pagination
+                    style="text-align:right"
                     background
                     small
                     @size-change="handleSizeChange"
                     @current-change="handleCurrentChange"
                     :current-page="params.content.pageNumber"
-                    :page-size="params.content.pageSize"
-                    layout="total, prev, pager, next, jumper"
+                    :page-sizes="[20, 50, 100, 200]"
+                    layout="total,sizes, prev, pager, next, jumper"
                     :total="total">
-                  </el-pagination>
-                </el-form-item>
-              </el-col>
-            </el-form>
-          </el-row>
+                </el-pagination>
+              </div>
+            </el-col>
+          </el-form>
+        </el-row>
       </div>
       <div class="fixed__btn__panel">
         <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
@@ -58,6 +66,7 @@ export default {
       productList:[],
       tablecols:[],
       total:0,
+      search:'',
       form: {
         sa_brandid: '',
         groupname: '',
@@ -166,6 +175,13 @@ export default {
       this.params.content.pageNumber = val
       this.getProductList()
     },
+    clearData(){
+      this.search = ""
+    },
+    queryClick(){
+      this.params.content.where.condition = this.search
+      this.getProductList()
+    }
   }
 }
 

src/HDrpManagement/ProductGroupMag/modules/addGroupDetailBtn.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="mini" @click="editBtn">新 增 商 品 明 细</el-button>
-    <el-drawer title="新增商品组" :visible.sync="drawer" size="50%" direction="rtl" append-to-body>
+    <el-drawer title="新增商品明细" :visible.sync="drawer" size="50%" direction="rtl" append-to-body>
       <div class="drawer__panel">
           <el-row>
             <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">
@@ -22,6 +22,7 @@
                   <Table ref="table" v-model="form.itemno" :layout="tablecols" :data="productList" :custom="false" height="500px" @upDateData="upDateData">
                   </Table>
                   <el-pagination
+                    style="text-align:right"
                     background
                     small
                     @size-change="handleSizeChange"

src/HDrpManagement/ProductGroupMag/modules/details.vue

@@ -15,11 +15,12 @@
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation">
-        <el-popover placement="bottom" style="20px">
-          <Up type="one" @upSuccess="queryMainData" :id="[mainData.sa_itemgroupid]" v-if="mainData.isonsale == 0 && tool.checkAuth($route.name,'up_sales')"></Up>
+        <shelves class="inline-16" @upSuccess="queryMainData" :data="mainData"></shelves>
+<!--        <el-popover placement="bottom" style="20px">
+          <Up type="one" @upSuccess="queryMainData" ":id="[mainData.sa_itemgroupid] v-if="mainData.isonsale == 0 && tool.checkAuth($route.name,'up_sales')"></Up>
           <Down type="one" @downSuccess="queryMainData" :id="[mainData.sa_itemgroupid]" v-if="mainData.isonsale == 1 && tool.checkAuth($route.name,'down_sales')"></Down>
           <el-button size="mini" slot="reference" icon="el-icon-more"></el-button>
-        </el-popover>
+        </el-popover>-->
       </div>
       <div slot="slot0" class="container normal-panel">
         <addGroupDetail v-if="mainData" :rowData="mainData"/>
@@ -32,6 +33,7 @@
 import addGroupDetail from './addGroupDetail'
 import Up from './up'
 import Down from './down'
+import shelves from '../components/shelves'
 export default {
   name: "detail",
   data() {
@@ -44,7 +46,8 @@ export default {
   components:{
     addGroupDetail,
     Up,
-    Down
+    Down,
+    shelves
   },
   methods:{
     async queryMainData(id) {

src/HDrpManagement/ProductGroupMag/modules/edit.vue

@@ -1,77 +1,61 @@
 <template>
-  <div class="inline-16">
+  <div >
     <el-button size="mini" @click="editBtn">编 辑</el-button>
-    <el-dialog title="编辑产品组" append-to-body :visible.sync="dialogTableVisible" width="30%">
-      <el-row :gutter="20">
-        <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">
-          <el-col :span="24">
-            <el-form-item label="产品组名称" prop="groupname">
-              <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="品牌" prop="sa_brandid">
-              <el-select disabled v-model="form.sa_brandid" placeholder="请选择品牌">
-                <el-option
-                  v-for="item in brandList()"
-                  :key="item.sa_brandid"
-                  :label="item.brandname"
-                  :value="item.sa_brandid"
-                  size="small">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="24">
-            <el-form-item label="商品" prop="itemno">
-              <el-select v-model="form.itemno" placeholder="请选择商品">
-                <el-option
-                  v-for="item in productList()"
-                  :key="item.itemno"
-                  :label="item.itemname"
-                  :value="item.itemno"
-                  size="small">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="24">
-            <el-form-item label="自定义标签" prop="tag" style="margin-bottom:0px; !important">
-              <el-tag
-                :key="tag"
-                v-for="tag in form.tag"
-                closable
-                :disable-transitions="false"
-                @close="handleClose(tag)">
-                {{tag}}
-              </el-tag>
-              <el-input
-                class="input-new-tag"
-                v-if="inputVisible"
-                v-model="inputValue"
-                ref="saveTagInput"
-                size="small"
-                @keyup.enter.native="handleInputConfirm"
-                @blur="handleInputConfirm"
-              >
+    <el-drawer title="编辑商品组" :visible.sync="dialogTableVisible" size="40%" direction="rtl" append-to-body>
+      <div class="drawer__panel">
+        <el-row :gutter="20">
+          <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
+            <el-col :span="12">
+              <el-form-item label="商品组名称:" prop="groupname">
+                <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="品牌:" prop="sa_brandid">
+                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" @change="getProductList(params.content.pageNumber = 1,$refs.table.allArr=[])" style="width: 100%">
+                  <el-option v-for="item in brandList()" :key="item.sa_brandid" :label="item.brandname"
+                             :value="item.sa_brandid" size="small">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24" style="margin-bottom: 20px">
+              <label class="inline-16">可选商品</label>
+              <el-input placeholder="请输入搜索内容" suffix-icon="el-icon-search" v-model="search" @keyup.native.enter="queryClick" @clear="clearData()" style="width:260px" size="small" class="input-with-select inline-16" clearable>
               </el-input>
-              <el-button v-else class="button-new-tag" size="small" @click="showInput">+ New 标签</el-button>
-            </el-form-item>
-          </el-col> -->
-        </el-form>
-      </el-row>
-      <span slot="footer" class="dialog-footer">
-        <div>
-          <el-button @click="dialogTableVisible = false" size="small">取 消</el-button>
-          <el-button type="primary" @click="submit" size="small">确 定</el-button>
-        </div>
-      </span>
-    </el-dialog>
+            </el-col>
+            <el-col :span="24">
+              <Table ref="table" v-model="form.itemno" :layout="tablecols" :data="productList" :custom="false" height="500px"  @upDateData="upDateData">
+              </Table>
+              <div class="container normal-panel" style="text-align:right">
+                <el-pagination
+                    style="text-align:right"
+                    background
+                    small
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="params.content.pageNumber"
+                    :page-sizes="[20, 50, 100, 200]"
+                    layout="total,sizes, prev, pager, next, jumper"
+                    :total="total">
+                </el-pagination>
+              </div>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="dialogTableVisible = false" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
   </div>
 </template>
 
 <script>
+import Table from './table'
 export default {
+  components:{Table},
   data () {
     return {
       dialogTableVisible:false,
@@ -79,6 +63,10 @@ export default {
       seleteGroup:'',
       inputVisible: false,
       inputValue: '',
+      productList:[],
+      tablecols:[],
+      total:0,
+      search:'',
       form:{
         sa_brandid:'',
         groupname:'',
@@ -95,6 +83,19 @@ export default {
         itemno: [
           { required: true, message: '请选择商品', trigger: 'blur' },
         ]
+      },
+      params: {
+        "id": "20220923112503",
+        "version":1,
+        "content": {
+          "nocache":true,
+          "sa_itemgroupid":"",
+          "pageNumber":1,
+          "pageSize":20,
+          "where":{
+            "condition":""
+          }
+        }
       }
     }
   },
@@ -103,8 +104,14 @@ export default {
   watch: {
     
   },
-  created() {
-    
+  created () {
+    this.tablecols = this.tool.tabelCol(this.$route.name)['addProductTable'].tablecols
+    if (this.brandList()) {
+      this.form.sa_brandid = this.brandList()[0].sa_brandid
+    }
+    console.log(this.brandList());
+
+    this.getProductList()
   },
   methods: {
     submit() {
@@ -158,6 +165,38 @@ export default {
       }
       this.inputVisible = false;
       this.inputValue = '';
+    },
+    upDateData (data) {
+      if (data.length == 0) {
+        this.form.itemno = ''
+      } {
+        this.form.itemno = true
+      }
+    },
+    /* 可选择的商品列表 */
+    async getProductList() {
+      this.params.content.sa_brandid = this.form.sa_brandid
+      let res = await this.$api.requested(this.params)
+      this.productList = res.data
+      this.total = res.total
+      console.log(this.productList,'商品');
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.getProductList()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.getProductList()
+    },
+    clearData(){
+      this.search = ""
+    },
+    queryClick(){
+      this.params.content.where.condition = this.search
+      this.getProductList()
     }
   }
 }

src/HDrpManagement/ProductGroupMag/modules/editCopy.vue

@@ -0,0 +1,198 @@
+<template>
+  <div class="inline-16">
+    <el-button size="mini" @click="editBtn">编 辑</el-button>
+    <el-dialog title="编辑产品组" append-to-body :visible.sync="dialogTableVisible" width="30%">
+      <el-row :gutter="20">
+        <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">
+          <el-col :span="24">
+            <el-form-item label="产品组名称:" prop="groupname">
+              <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="24">
+            <el-form-item label="品牌:" prop="sa_brandid">
+              <el-select disabled v-model="form.sa_brandid" placeholder="请选择品牌">
+                <el-option
+                  v-for="item in brandList()"
+                  :key="item.sa_brandid"
+                  :label="item.brandname"
+                  :value="item.sa_brandid"
+                  size="small">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="24">
+            <el-form-item label="商品" prop="itemno">
+              <el-select v-model="form.itemno" placeholder="请选择商品">
+                <el-option
+                  v-for="item in productList()"
+                  :key="item.itemno"
+                  :label="item.itemname"
+                  :value="item.itemno"
+                  size="small">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col> -->
+          <!-- <el-col :span="24">
+            <el-form-item label="自定义标签" prop="tag" style="margin-bottom:0px; !important">
+              <el-tag
+                :key="tag"
+                v-for="tag in form.tag"
+                closable
+                :disable-transitions="false"
+                @close="handleClose(tag)">
+                {{tag}}
+              </el-tag>
+              <el-input
+                class="input-new-tag"
+                v-if="inputVisible"
+                v-model="inputValue"
+                ref="saveTagInput"
+                size="small"
+                @keyup.enter.native="handleInputConfirm"
+                @blur="handleInputConfirm"
+              >
+              </el-input>
+              <el-button v-else class="button-new-tag" size="small" @click="showInput">+ New 标签</el-button>
+            </el-form-item>
+          </el-col> -->
+        </el-form>
+      </el-row>
+      <span slot="footer" class="dialog-footer">
+        <div>
+          <el-button @click="dialogTableVisible = false" size="small">取 消</el-button>
+          <el-button type="primary" @click="submit" size="small">确 定</el-button>
+        </div>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      dialogTableVisible:false,
+      /* 当前选择的组 */
+      seleteGroup:'',
+      inputVisible: false,
+      inputValue: '',
+      form:{
+        sa_brandid:'',
+        groupname:'',
+        itemno:'',
+        tag:[]
+      },
+      rules:{
+        sa_brandid: [
+          { required: true, message: '请选择品牌', trigger: 'blur' },
+        ],
+        groupname: [
+          { required: true, message: '请输入商品组名称', trigger: 'blur' },
+        ],
+        itemno: [
+          { required: true, message: '请选择商品', trigger: 'blur' },
+        ]
+      }
+    }
+  },
+  props:['data'],
+  inject:['productList','brandList'],
+  watch: {
+    
+  },
+  created() {
+    
+  },
+  methods: {
+    submit() {
+      this.$refs.form.validate(async val => {
+        if(val) {
+          let res = await this.$api.requested({
+            "id": "20220922164303",
+            "version":1,
+            "content": {
+                "sa_itemgroupid":this.data.sa_itemgroupid,    
+                "sa_brandid":this.form.sa_brandid,
+                "groupname":this.form.groupname,
+                "itemno":this.form.itemno,
+                "tag": this.form.tag
+            }
+          })
+          this.tool.showMessage(res,() => {
+            this.$emit('onSuccess')
+            this.$refs.form.resetFields()
+            this.dialogTableVisible = false
+          })
+        }
+      })
+    },
+    editBtn() {      
+      this.dialogTableVisible = true
+      this.seleteGroup = this.data
+      let temp = JSON.parse(JSON.stringify(this.seleteGroup))
+      this.form = {
+        sa_brandid:temp.sa_brandid,
+        groupname:temp.groupname,
+        itemno:temp.itemno,
+        tag:temp.tag1
+      }
+      console.log(this.form);
+      
+    },
+    handleClose(tag) {
+      this.form.tag.splice(this.form.tag.indexOf(tag), 1);
+    },
+    showInput() {
+      this.inputVisible = true;
+      this.$nextTick(_ => {
+        this.$refs.saveTagInput.$refs.input.focus();
+      });
+    },
+    handleInputConfirm() {
+      let inputValue = this.inputValue;
+      if (inputValue) {
+        this.form.tag.push(inputValue);
+      }
+      this.inputVisible = false;
+      this.inputValue = '';
+    }
+  }
+}
+
+</script>
+<style scoped>
+/deep/.el-dialog__body {
+  padding-top: 10px !important;
+  padding-bottom: 0 !important;
+}
+/deep/.dialog-footer {
+  margin-top: 10px !important;
+}
+/deep/.el-form-item__content {
+  width: calc(100% - 100px) !important;
+}
+/deep/.el-select {
+  width: 100% !important;
+}
+/deep/.el-form-item {
+  width: 100% !important;
+}
+.el-tag + .el-tag {
+  margin-left: 10px;
+  margin-bottom: 10px;
+}
+.button-new-tag {
+  margin-left: 10px;
+  height: 32px;
+  line-height: 30px;
+  padding-top: 0;
+  padding-bottom: 0;
+}
+.input-new-tag {
+  width: 90px;
+  margin-left: 10px;
+}
+</style>

src/HDrpManagement/ProductGroupMag/modules/editGroupDetailBtn.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="text" size="small" @click="editBtn">编辑</el-button>
-    <el-dialog title="产品组明细" append-to-body :visible.sync="dialogTableVisible" width="30%">
+    <el-dialog title="商品组明细" append-to-body :visible.sync="dialogTableVisible" width="30%">
       <el-form label-position="right" ref="form" :rules="rules" inline label-width="100px" :model="form" size="small">
         <el-form-item label="商品" prop="product">
           <el-select v-model="form.product" placeholder="请选择商品">

src/HDrpManagement/payvoucher/index.vue

@@ -1,7 +1,13 @@
 <template>
   <div>
     <basicLayout ref="list" formPath="payvoucher" tableName="payvoucherTable" idName="sa_cashbillid" :apiId="{query:20221010102903,del:20221009103203}" :options="options">
-      <div slot="custom"></div>
+      <div slot="custom" style="display:flex">
+        <label class="search__label " style="margin: auto;width: 35px;">状态:</label>
+        <el-select class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
+          <el-option :key="1" :value="0" label="新建"></el-option>
+          <el-option :key="2" :value="1" label="审核"></el-option>
+        </el-select>
+      </div>
       <template v-slot:tbList="scope">
         <div>
           {{scope.data.column.data[[scope.data.column.columnname]]}}
@@ -32,7 +38,11 @@ export default {
           label:'审核',
           value:'审核'
         }
-      ]
+      ],
+      selectParam: {
+        status:'',
+        accountname:''
+      }
     }
   },
   methods:{
@@ -48,11 +58,27 @@ export default {
       this.tool.showMessage(res,()=>{
         this.$refs.list.listData()
       })
+    },
+    selectChange(){
+      console.log(this.selectParam)
+      if (this.selectParam.status === 0){
+        this.selectParam.status = '新建'
+      }else{
+        this.selectParam.status = '审核'
+      }
+      this.$refs.list.param.content.where = this.selectParam
+      this.$refs.list.param.content.phonenumber = 1
+      this.$refs.list.listData()
     }
   }
 }
 </script>
 
 <style scoped>
-
+.search__label{
+  display: inline-block;
+  width: 80px;
+  font-size: 14px;
+  color:rgb(163, 163, 163) !important;
+}
 </style>

src/HDrpManagement/prodectFileData/modules/add.vue

@@ -4,7 +4,7 @@
     <el-drawer
       title="新增资料"
       :visible.sync="drawer"
-      size="800px"
+      size="30%"
       direction="rtl"
       append-to-body
       @close="onClose"
@@ -30,8 +30,8 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item  label="上传附件">
-                <uploadFile ref="upload" style="margin-top:0px" :folderid="folderid" accept=".text,.doc,.xls" :bindData="{ownertable:'plm_technicalinfo',ownerid:plm_technicalinfoid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
+              <el-form-item  label="上传附件:">
+                <uploadFile ref="upload"  :folderid="folderid" accept=".text,.doc,.xls" :bindData="{ownertable:'plm_technicalinfo',ownerid:plm_technicalinfoid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
               </el-form-item>
             </el-col>
           </el-form>

src/HDrpManagement/prodectFileData/modules/edit.vue

@@ -4,12 +4,12 @@
     <el-drawer
       title="编辑资料"
       :visible.sync="drawer"
-      size="800px"
+      size="30%"
       direction="rtl"
       append-to-body>
       <div class="drawer__panel">
         <el-row :gutter="20">
-          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="left" label-width="90px">
+          <el-form :model="form" :rules="rules"  ref="form"  size="mini" label-position="right" label-width="90px">
             <el-col :span="24">
               <el-form-item prop="type"  label="资料类别:">
                 <el-select v-model="form.type" placeholder="请选择资料类别" style="width: 100%">
@@ -28,24 +28,23 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item  label="上传附件">
-                <uploadFile ref="upload" style="margin-top:0px" :folderid="folderid" accept=".text,.doc,.xls" :bindData="{ownertable:'plm_technicalinfo',ownerid:form.plm_technicalinfoid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
+              <el-form-item  label="上传附件:">
+                <uploadFile ref="upload"  :folderid="folderid" accept=".text,.doc,.xls" :bindData="{ownertable:'plm_technicalinfo',ownerid:form.plm_technicalinfoid,usetype:'default'}" @onSuccess="uploadSuccess"></uploadFile>
               </el-form-item>
             </el-col>
           </el-form>
         </el-row>
-      </div>
-      <div>
-        <file_table ref="list" :id="form.plm_technicalinfoid">
-          <template v-slot:del="scope">
-            <file_delete v-if="tool.checkAuth($route.name,'delete')" :data="scope.data" :type="'text'" @deleteSuccess="onSuccess"></file_delete>
-          </template>
-        </file_table>
-      </div>
-
-      <div class="fixed__btn__panel">
-        <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
-        <el-button size="small" type="primary" @click="onSubmit"   class="normal-btn-width btn-primary">确 定</el-button>
+        <div>
+          <file_table ref="list" :id="form.plm_technicalinfoid">
+            <template v-slot:del="scope">
+              <file_delete v-if="tool.checkAuth($route.name,'delete')" :data="scope.data" :type="'text'" @deleteSuccess="onSuccess"></file_delete>
+            </template>
+          </file_table>
+        </div>
+        <div class="fixed__btn__panel">
+          <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
+          <el-button size="small" type="primary" @click="onSubmit"   class="normal-btn-width btn-primary">确 定</el-button>
+        </div>
       </div>
     </el-drawer>
   </div>