Merge branch 'greenUrgent' into mergeBranch

src/HDrpManagement/ProductGroupMag/modules/add.vue

@@ -2,7 +2,7 @@
   <div>
     <el-button type="primary" size="small" @click="drawer=true">新 建</el-button>
     <el-drawer title="创建商品组" :visible.sync="drawer" size="80%" direction="rtl" append-to-body @close="onCancel" :show-close="false">
-      <div class="drawer__panel">
+      <div class="drawer__panel" style="margin-bottom: 0!important;">
         <el-row :gutter="20">
           <el-form :model="form" :rules="rules"  ref="form"  size="small" label-position="right" label-width="100px">
             <el-col :span="6">
@@ -34,16 +34,85 @@
             <el-col :span="24">
               <p class="normal-title normal-margin">
                 添加产品
-                <el-button v-if="col === 0" type="text" size="mini" @click="col = 12">选择商品</el-button>
+                <el-button v-if="col === 0" type="text" size="mini" @click="productData(col=12)">选择商品</el-button>
                 <el-button v-else type="text" size="mini" @click="col = 0">关闭选择</el-button>
               </p>
 
             </el-col>
             <el-col :span="24 - col">
-              <Table type="add" :data="tableData" ref="submitProduct" @onSuccess="onSuccess" @deleteProduct="deleteProduct"></Table>
+              <tableNewLayout :layout="tablecols" :data="tableData" :opwidth="200" height="calc(100vh - 300px)" :width="true" :custom="true" >
+                <template v-slot:customcol="scope">
+                  <div v-if="scope.column.columnname === 'itemclass'">
+                     <span v-for="(item,index) in scope.column.data.itemclass" :key="index">
+                       {{item?item.itemclassname+',':'--'}}
+                    </span>
+                  </div>
+                  <div v-else-if="scope.column.columnname === 'isonsale'">
+                     <span >
+                      {{scope.column.data == 1?'上架':'下架'}}
+                     </span>
+                  </div>
+                  <div v-else-if="scope.column.columnname === 'marketprice'">
+                    {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+                  </div>
+                  <div v-else>
+                    {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
+                  </div>
+                </template>
+                <template v-slot:opreation="scope">
+                  <el-popconfirm
+                      title="确定删除吗？"
+                      @confirm="deleteProduct(scope.data)">
+                    <el-button slot="reference" type="text" size="mini">删 除</el-button>
+                  </el-popconfirm>
+                </template>
+              </tableNewLayout>
             </el-col>
             <el-col :span="col">
-              <selectTable :all="true" @addProduct="addProduct"></selectTable>
+<!--              <selectTable :all="true" @addProduct="addProduct"></selectTable>-->
+              <tableNewLayout :layout="tablecolsAdd" :data="productList" :opwidth="200" height="calc(100vh - 300px)" :width="true" :custom="true" fixedName="operation">
+                <template v-slot:customcol="scope">
+                  <div v-if="scope.column.columnname === 'itemclass'">
+                     <span v-for="(item,index) in scope.column.data.itemclass" :key="index">
+                       {{item?item.itemclassname+',':'--'}}
+                    </span>
+                  </div>
+                  <div v-else-if="scope.column.columnname === 'brand'">
+                    <p v-for="(item,index) in scope.column.data.brand" :key="index">
+                      <span style="float: left" v-if="index === scope.column.data.brand.length -1">{{item?item.brandname+'':'--'}}</span>
+                      <span style="float: left" v-else>{{item?item.brandname+',':'--'}}</span>
+                    </p>
+                  </div>
+                  <div v-else-if="scope.column.columnname === 'unitid'">
+                    <el-tag size="mini" type="info" effect="plain">{{scope.column.data.unitname}}/{{scope.column.data.axunitname}}</el-tag>
+                  </div>
+                  <div v-else-if="scope.column.columnname === 'marketprice'">
+                    {{scope.column.data[[scope.column.columnname]]?tool.formatAmount(scope.column.data[[scope.column.columnname]],2):scope.column.data[[scope.column.columnname]] == 0?'0.00':'--'}}
+                  </div>
+                  <div v-else-if="scope.column.columnname === 'attinfos'">
+                    <div v-if="scope.column.data.attinfos[0]">
+                      <previewImage style="height:38px;width:38px" :image="scope.column.data.attinfos[0]" :list="scope.column.data.attinfos" :deletebtn="false"></previewImage>
+                    </div>
+                  </div>
+                  <div v-else>
+                    {{scope.column.data[[scope.column.columnname]] || scope.column.columnname === 'operation'?scope.column.data[[scope.column.columnname]]:'--'}}
+                  </div>
+                </template>
+                <template v-slot:opreation="scope">
+                  <el-button type="text" size="small" @click="addProduct(scope.data)">添 加</el-button>
+                </template>
+              </tableNewLayout>
+              <div style="margin-top:16px;float:right">
+                <el-pagination
+                    background
+                    @size-change="handleSizeChange"
+                    @current-change="handleCurrentChange"
+                    :current-page="currentPage"
+                    :page-size="params.content.pageSize"
+                    layout="total,sizes, prev, pager, next, jumper"
+                    :total="total">
+                </el-pagination>
+              </div>
             </el-col>
           </el-form>
         </el-row>
@@ -70,6 +139,8 @@ export default {
       drawer:false,
       col:0,
       tableData:[],
+      tablecols:[],
+      tablecolsAdd:[],
       index:0,
       form: {
         sa_brandid: '',
@@ -94,11 +165,30 @@ export default {
         sequence: [
           { required: false, message: '请输入序号', trigger: 'blur' },
         ],
-      }
+      },
+      params:{
+        "id": 20220923112503,
+        "content": {
+          "nocache":true,
+          "pageNumber": 1,
+          "pageSize": 20,
+          "sa_itemgroupid":0,
+          "where": {
+            "condition": '',
+            "type": this.all ? '1' : '' //未上架商品也拉取
+          }
+        }
+      },
+      tableSelectData:[],
+      productList: [],
+      total:0,
+      currentPage:0
     }
   },
   inject:['brandList'],
   created () {
+    this.tablecols = this.tool.tabelCol(this.$route.name).productListTable.tablecols
+    this.tablecolsAdd = this.tool.tabelCol(this.$route.name).productAddTable.tablecols
   },
   computed:{
     ...mapGetters({
@@ -108,6 +198,7 @@ export default {
   methods: {
     onCancel(){
       this.drawer = false
+      this.col = 0
       this.form={
         sa_brandid: '',
         groupname: '',
@@ -115,10 +206,28 @@ export default {
         itemid:'0',
         itemname:'',
         tag: []
-      },
+      }
       this.tableData = []
     },
+    async productData(){
+      this.params.content.where.type = true
+      const res = await this.$api.requested(this.params)
+      this.productList = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.productData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.productData()
+    },
     addProduct (row) {
+      this.productList.splice(this.productList.findIndex(item => item.itemid == row.itemid),1)
       this.index ++
       row.sequence = this.index
       this.tableData.push(row)
@@ -147,17 +256,37 @@ export default {
           "id": "20220922164303",
           "content": this.form
         })
-        this.tool.showMessage(res,()=>{
+        this.tool.showMessage(res,async()=>{
           this.$store.commit('setLoading',false)
           this.groupdata = res.data
           this.index = 0
-          this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
+          this.col = 0
+          // this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
+          this.submitProduct(res.data.sa_itemgroupid)
           this.$store.dispatch('changeDetailDrawer',true)
           this.$router.push({path:'/productGroupDetail',query:{id:res.data.sa_itemgroupid,rowindex:res.data.rowindex}})
         })
         }
       })
 
+    },
+    async submitProduct (id) {
+      const res = await this.$api.requested({
+        "id": "20220923110303",
+        "content": {
+          "sa_itemgroupid":id,
+          "itemclassinfos":this.tableData.map(e=>{
+            return {
+              "sa_itemgroupmxid":0,
+              "itemno":e.itemno,
+              "itemid":e.itemid,
+              "sequence":e.sequence
+            }
+          })
+        }
+      })
+      res.code === 1?this.onSuccess():this.tool.showMessage(res)
+
     },
     productChange (data) {
       this.form.itemno = data.itemno
@@ -180,8 +309,12 @@ export default {
       this.$emit('onSuccess')
       this.drawer = false
 
-    }
-  }
+    },
+    onInput ($event,data) {
+      this.$forceUpdate()
+    },
+  },
+
 }
 
 </script>

src/HDrpManagement/ProductGroupMag/modules/addCopy.vue

@@ -0,0 +1,211 @@
+<template>
+  <div>
+    <el-button type="primary" size="small" @click="drawer=true">新 建</el-button>
+    <el-drawer title="创建商品组" :visible.sync="drawer" size="80%" direction="rtl" append-to-body @close="onCancel" :show-close="false">
+      <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="6">
+              <el-form-item label="商品组名称:" prop="groupname">
+                <el-input v-model="form.groupname" placeholder="请输入商品组名称"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="品牌:" prop="sa_brandid">
+                <el-select v-model="form.sa_brandid" placeholder="请选择品牌" 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="6">
+              <el-form-item label="序号:" prop="sequence">
+                <el-input v-model="form.sequence" placeholder="请输入商品组序号"></el-input>
+              </el-form-item>
+            </el-col>
+            <el-col :span="6">
+              <el-form-item label="默认商品:" prop="sequence">
+                <selectProduct ref="product" @selectRow="productChange" :productData="tableData">
+                  <el-input v-model="form.itemname" :disabled="tableData.length == 0" readonly type="text" slot="input" size="small" @focus="$refs.product.tableData=tableData,$refs.product.visible=true"></el-input>
+                </selectProduct>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <p class="normal-title normal-margin">
+                添加产品
+                <el-button v-if="col === 0" type="text" size="mini" @click="col = 12">选择商品</el-button>
+                <el-button v-else type="text" size="mini" @click="col = 0">关闭选择</el-button>
+              </p>
+
+            </el-col>
+            <el-col :span="24 - col">
+              <Table type="add" :data="tableData" ref="submitProduct" @onSuccess="onSuccess" @deleteProduct="deleteProduct"></Table>
+            </el-col>
+            <el-col :span="col">
+              <selectTable :all="true" @addProduct="addProduct"></selectTable>
+            </el-col>
+          </el-form>
+        </el-row>
+      </div>
+      <div class="fixed__btn__panel">
+        <el-button size="small" @click="onCancel" class="normal-btn-width">取 消</el-button>
+        <el-button size="small" type="primary" @click="submit" :loading="loading" class="normal-btn-width">确 定</el-button>
+      </div>
+    </el-drawer>
+  </div>
+</template>
+
+<script>
+import previewImage from '@/components/previewImage/index.vue'
+import selectTable from '@/template/product/index.vue'
+import selectProduct from '@/template/selectProduct/index.vue'
+import Table from './table.vue'
+import {mapGetters} from "vuex";
+export default {
+  props: ['data', 'type'],
+  components:{selectTable,previewImage,Table,selectProduct},
+  data () {
+    return {
+      drawer:false,
+      col:0,
+      tableData:[],
+      tablecols:[],
+      tablecolsAdd:[],
+      index:0,
+      form: {
+        sa_brandid: '',
+        groupname: '',
+        itemid:'0',
+        itemno: '',
+        itemname:'',
+        sequence:'1',
+        tag: [],
+        sa_itemgroupid:0,
+      },
+      rules: {
+        sa_brandid: [
+          { required: true, message: '请选择品牌', trigger: 'blur' },
+        ],
+        groupname: [
+          { required: true, message: '请输入商品组名称', trigger: 'blur' },
+        ],
+        itemno: [
+          { required: true, message: '请选择商品', trigger: 'blur' },
+        ],
+        sequence: [
+          { required: false, message: '请输入序号', trigger: 'blur' },
+        ],
+      }
+    }
+  },
+  inject:['brandList'],
+  created () {
+    this.tablecols = this.tool.tabelCol(this.$route.name).productListTable.tablecols
+    this.tablecolsAdd = this.tool.tabelCol(this.$route.name).productAddTable.tablecols
+  },
+  computed:{
+    ...mapGetters({
+      loading:'loading'
+    })
+  },
+  methods: {
+    onCancel(){
+      this.drawer = false
+      this.form={
+        sa_brandid: '',
+        groupname: '',
+        itemno: '',
+        itemid:'0',
+        itemname:'',
+        tag: []
+      },
+      this.tableData = []
+    },
+    addProduct (row) {
+      this.index ++
+      row.sequence = this.index
+      this.tableData.push(row)
+      const res = new Map();
+      this.tableData = this.tableData.filter((item) => !res.has(item['itemid']) && res.set(item['itemid'], 1));
+    },
+    deleteProduct (row) {
+      this.tableData = this.tableData.filter(e=>{
+        return e.itemid !== row.itemid
+      })
+      if (this.tableData.findIndex(item => item.itemno == this.form.itemno) == -1) {
+        this.form.itemno = ''
+        this.form.itemname = ''
+      }
+    },
+    async submit() {
+      if (this.tableData.length === 0)
+        return this.$message({
+          message:'商品组明细不能为空',
+          type:'error'
+        })
+      this.$refs.form.validate(async val => {
+        if (val) {
+          this.$store.commit('setLoading',true)
+          const res = await this.$api.requested({
+          "id": "20220922164303",
+          "content": this.form
+        })
+        this.tool.showMessage(res,async()=>{
+          this.$store.commit('setLoading',false)
+          this.groupdata = res.data
+          this.index = 0
+          this.$refs['submitProduct'].submitProduct(res.data.sa_itemgroupid)
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/productGroupDetail',query:{id:res.data.sa_itemgroupid,rowindex:res.data.rowindex}})
+        })
+        }
+      })
+
+    },
+    productChange (data) {
+      this.form.itemno = data.itemno
+      this.form.itemid = data.itemid
+      this.form.itemname = data.itemname
+      this.$refs.product.visible = false
+    },
+    async onSuccess () {
+      const res = await this.$api.requested({
+        "id": "20220922164303",
+        "content": {
+          "sa_itemgroupid":this.groupdata.sa_itemgroupid,     //sa_itemgroupid<=0时 为新增
+          "sa_brandid":this.groupdata.sa_brandid,
+          "groupname":this.groupdata.groupname,
+          "itemno":this.tableData[0].itemno,
+          "itemid":this.tableData[0].itemid,
+          "tag": []
+        }
+      })
+      this.$emit('onSuccess')
+      this.drawer = false
+
+    },
+    onInput ($event,data) {
+      this.$forceUpdate()
+    },
+  },
+
+}
+
+</script>
+<style scoped>
+.dialog-footer {
+  margin-top: 32px;
+  text-align: center;
+}
+/deep/.el-form-item {
+  width: 100%;
+}
+/deep/.el-form-item__content {
+  width: calc(100% - 100px);
+}
+/deep/.el-pagination {
+  text-align: center;
+  margin-top: 10px;
+}
+</style>

src/HDrpManagement/ProductGroupMag/modules/table.vue

@@ -94,6 +94,11 @@
           </span>
         </template>
       </el-table-column>
+      <el-table-column
+          prop="actuatorbrand"
+          label="执行器品牌"
+          width="0">
+      </el-table-column>
       <!-- <el-table-column
           prop="unitid"
           label="计量单位"

src/HDrpManagement/dataanalysis/modules/clue.vue

@@ -108,7 +108,21 @@ export default {
       totalFollow:0,
       begindate:'',
       enddate:'',
-      select:'周'
+      select:'周',
+      sort:[
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 207,
+          sortname: "新增，更新排序"
+        },
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 208,
+          sortname: "跟进排序"
+        }
+      ]
     }
   },
   methods:{
@@ -119,6 +133,7 @@ export default {
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listAdd = res.data
       this.currentPageAdd = res.pageNumber
@@ -141,6 +156,7 @@ export default {
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listUpdate = res.data
       this.currentPageUpdate = res.pageNumber
@@ -163,6 +179,7 @@ export default {
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[1]]
       const res = await this.$api.requested(this.param)
       this.listFollow = res.data
       this.currentPageFollow = res.pageNumber

src/HDrpManagement/dataanalysis/modules/customer.vue

@@ -120,17 +120,30 @@ export default {
       totalFollow:0,
       begindate:'',
       enddate:'',
-      select:'周'
+      select:'周',
+      sort:[
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 207,
+          sortname: "新增，更新排序"
+        },
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 208,
+          sortname: "跟进排序"
+        }
+      ]
     }
   },
   methods:{
     async queryAdd(){
-      /*this.isDep ? this.param.content.type = 1: this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 4
-    /*  this.param.content.dataid = this.dataid*/
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listAdd = res.data
       this.currentPageAdd = res.pageNumber
@@ -147,12 +160,11 @@ export default {
       this.queryAdd()
     },
     async queryUpdate(){
-     /* this.isDep ? this.param.content.type = 1: this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 5
-      /*this.param.content.dataid = this.dataid*/
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listUpdate = res.data
       this.currentPageUpdate = res.pageNumber
@@ -169,12 +181,11 @@ export default {
       this.queryUpdate()
     },
     async queryFollow(){
-     /* this.isDep ? this.param.content.type = 1: this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 6
-     /* this.param.content.dataid = this.dataid*/
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[1]]
       const res = await this.$api.requested(this.param)
       this.listFollow = res.data
       this.currentPageFollow = res.pageNumber

src/HDrpManagement/dataanalysis/modules/documents.vue

@@ -90,7 +90,21 @@ export default {
       contractTotal:0,
       begindate:'',
       enddate:'',
-      select:''
+      select:'',
+      sort:[
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 207,
+          sortname: "新增，更新排序"
+        },
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 208,
+          sortname: "跟进排序"
+        }
+      ]
     }
   },
   methods: {
@@ -101,6 +115,7 @@ export default {
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[1]]
       const res = await this.$api.requested(this.param)
       this.quotationList = res.data
       this.quotationCurrentPage = res.pageNumber
@@ -123,6 +138,7 @@ export default {
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[1]]
       const res = await this.$api.requested(this.param)
       this.contractList = res.data
       this.contractCurrentPage = res.pageNumber

src/HDrpManagement/dataanalysis/modules/project.vue

@@ -120,17 +120,30 @@ export default {
       totalFollow:0,
       begindate:'',
       enddate:'',
-      select:'周'
+      select:'周',
+      sort:[
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 207,
+          sortname: "新增，更新排序"
+        },
+        {
+          reversed : 0,
+          sorted: 1,
+          sortid: 208,
+          sortname: "跟进排序"
+        }
+      ]
     }
   },
   methods:{
     async queryAdd(){
-   /*   this.isDep ? this.param.content.type = 1: this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 7
-     /* this.param.content.dataid = this.dataid*/
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listAdd = res.data
       this.currentPageAdd = res.pageNumber
@@ -147,12 +160,11 @@ export default {
       this.queryAdd()
     },
     async queryUpdate(){
-     /* this.isDep ? this.param.content.type = 1: this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 8
-     /* this.param.content.dataid = this.dataid*/
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[0]]
       const res = await this.$api.requested(this.param)
       this.listUpdate = res.data
       this.currentPageUpdate = res.pageNumber
@@ -169,12 +181,11 @@ export default {
       this.queryUpdate()
     },
     async queryFollow(){
-   /*   this.isDep ? this.param.content.type = 1: this.isPerson ? this.param.content.type = 0 : this.param.content.type = ''*/
       this.param.content.dataType = 9
-     /* this.param.content.dataid = this.dataid*/
       this.param.content.where.begindate = this.select ? '' :this.begindate
       this.param.content.where.enddate = this.select ? '' : this.enddate
       this.param.content.dateType = this.select
+      this.param.content.sort = [this.sort[1]]
       const res = await this.$api.requested(this.param)
       this.listFollow = res.data
       this.currentPageFollow = res.pageNumber

src/template/product/index.vue

@@ -1,5 +1,5 @@
 <template>
-<div> 
+<div>
   <div class="flex-align-center flex-between normal-margin">
     <slot name="operation"></slot>
     <div class="flex-align-center">
@@ -47,6 +47,11 @@
           <p><span>{{scope.row.spec}}</span></p>
         </template>
       </el-table-column>
+      <el-table-column
+          prop="actuatorbrand"
+          label="执行器品牌"
+          width="117">
+      </el-table-column>
       <el-table-column
           prop="caliber"
           label="口径"
@@ -158,7 +163,7 @@ export default {
       this.total = res.total
       this.currentPage = res.pageNumber
       console.log(this.tableData);
-      
+
     },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
@@ -204,4 +209,4 @@ export default {
 .image {
   width:40px;height:40px;margin:0px auto;
 }
-</style>
+</style>