Merge branch 'xiaoqin' into mergeBranch

src/Form/marketing2/agent/edit.vue

@@ -55,7 +55,7 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="经销商编号" prop="agentnum">
-                <el-input v-model="form.agentnum" placeholder="输入经销商编号"></el-input>
+                <el-input :disabled="true" v-model="form.agentnum" placeholder="输入经销商编号"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">

src/HDrpManagement/ProductMag/modules/addClass.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="dialogFormVisible=true" >设置分类</el-button>
-    <el-dialog append-to-body title="设置分类" :visible.sync="dialogFormVisible" width="500px">
+    <el-dialog append-to-body title="设置分类" :visible.sync="dialogFormVisible" width="900px">
       <div class="drawer__panel" >
         <el-tree
           ref="tree"
@@ -11,6 +11,14 @@
           :default-expand-all="true"
           :default-checked-keys="data.checkArr">
         </el-tree>
+        <!-- <selectTable v-if="dialogFormVisible" idName="itemclassid" ref="table" v-model="result" :layout="tablecols" :data="tableList" :custom="true">
+          <template v-slot:customcol="scope">
+            <div v-if="scope.column.columnname == 'amount'">
+              <el-input :disabled="!isEdit(scope.column.data)" v-model="scope.column.data.amount" size="small"></el-input>
+            </div>
+            <div v-else>{{scope.column.data[scope.column.columnname]}}</div>
+          </template>
+        </selectTable> -->
       </div>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogFormVisible=false" class="normal-btn-width">取 消</el-button>
@@ -21,18 +29,28 @@
 </template>
 
 <script>
-import { log } from '@antv/g2plot/lib/utils'
+import selectTable from '@/components/selectTable/index'
 export default {
   props:['data'],
+  components:{selectTable},
   data () {
     return {
       dialogFormVisible:false,
       classList:[],
-      disabledId:[]
+      disabledId:[],
+      tableList:[],
+      tablecols:[],
+      result:[]
     }
   },
   methods:{
     async onSubmit () {
+      // let arr = this.$refs.table.allArr.map(item => item.itemclassid)
+      // if (!arr) return this.$message({
+      //   title:'提示',
+      //   message:'请选择分类',
+      //   type:'warning'
+      // })
       let arr = this.$refs.tree.getCheckedNodes().map(item => item.itemclassid)
       let res = await this.$api.requested({
         "id": 20220927090102,
@@ -68,7 +86,35 @@ export default {
         }
       })
       this.classList = this.createDeep(res.data)
-      console.log(this.classList);
+      // this.tableList = this.compileTable(res.data)
+    },
+    compileTable (data) {
+      let arr = []
+      function deep (brand,ttemclass) {
+        console.log(brand);
+        let arr2 = []
+        for (let index = 0; index < ttemclass.subdep.length; index++) {
+          let obj = {
+            brandname:brand.itemclassname,
+            sa_brandid:brand.itemclassid,
+            itemclassname2:ttemclass.itemclassname,
+            itemclassid2:ttemclass.itemclassid,
+            itemclassname:ttemclass.subdep[index].itemclassname,
+            itemclassfullname:ttemclass.subdep[index].itemclassfullname,
+            itemclassid:ttemclass.subdep[index].itemclassid,
+            itemclassnum:ttemclass.subdep[index].itemclassnum,
+          }
+          arr2.push(obj)
+        }
+        return arr2
+      }
+      for (let i = 0; i< data.length; i++) {
+        console.log(data[i]);
+        for (let j = 0; j < data[i].subdep.length; j++) {
+          arr.push(...deep(data[i],data[i].subdep[j]))
+        }
+      }
+      return arr
     },
     createDeep (data) {
       let arr = []
@@ -92,10 +138,11 @@ export default {
         arr.push(createNodes(item))
       })
       return arr
-    } 
+    },
   },
   created () {
     this.getClassList()
+    this.tablecols = this.tool.tabelCol(this.$route.name)['selectClassTable'].tablecols
   }
 }
 

src/HDrpManagement/afterSalesmag/modules/detail.vue

@@ -68,7 +68,7 @@
         />
       </div>
       <div slot="slot0" >
-        <productDetail ref="productDetail">
+        <productDetail ref="productDetail" @onSuccess="queryMainData">
           <addProduct v-if="mainData.status == '新建' && tool.checkAuth($route.name,'productDetailManage') && mainData" @onSuccess="$refs.productDetail.listData()" slot="addProduct" :data="mainData" />
           <template v-slot:editProduct="scope">
             <el-button v-if="mainData.status == '新建' && tool.checkAuth($route.name,'productDetailManage')" class="inline-16" type="text" size="mini" :disabled="!isEdit" @click="$refs.productDetail.currentProduct=scope.data">编 辑</el-button>            
@@ -79,7 +79,7 @@
               nameId="20230105111203" 
               nameKey="sa_aftersalesmag_itemsids" 
               :id="scope.data.sa_aftersalesmag_itemsid"
-              @deleteSuccess="$refs.productDetail.listData()"
+              @deleteSuccess="$refs.productDetail.listData(),queryMainData()"
               v-if="mainData.status == '新建' && tool.checkAuth($route.name,'productDetailManage')"
             ></delete-btn>
           </template>

src/HDrpManagement/aftersalesBill/modules/detail.vue

@@ -42,7 +42,7 @@
         />
       </div>
       <div slot="slot0" >
-        <productDetail ref="productDetail">
+        <productDetail ref="productDetail" @onSuccess="queryMainData">
           <addProduct v-if="mainData.status == '新建' && tool.checkAuth($route.name,'productDetailManage') && mainData" @onSuccess="$refs.productDetail.listData()" slot="addProduct" :data="mainData" />
           <template v-slot:editProduct="scope">
             <el-button v-if="mainData.status == '新建' && tool.checkAuth($route.name,'productDetailManage')" class="inline-16" type="text" size="mini" :disabled="!isEdit" @click="$refs.productDetail.currentProduct=scope.data">编 辑</el-button>            
@@ -53,7 +53,7 @@
               nameId="20230105111203" 
               nameKey="sa_aftersalesmag_itemsids" 
               :id="scope.data.sa_aftersalesmag_itemsid"
-              @deleteSuccess="$refs.productDetail.listData()"
+              @deleteSuccess="$refs.productDetail.listData(),queryMainData()"
               v-if="mainData.status == '新建' && tool.checkAuth($route.name,'productDetailManage')"
             ></delete-btn>
           </template>

src/HDrpManagement/dispatch/details/index.vue

@@ -25,7 +25,7 @@
         <default-info :mainData="mainData"></default-info>
       </div>
       <div slot="slot0" >
-        <product-list ref="product" :data="mainData"></product-list>
+        <product-list ref="product" :data="mainData" @onSuccess="queryMainData"></product-list>
       </div>
       <div slot="slot1" >
         <erpInfo ref="erp" :data="mainData"></erpInfo>
@@ -136,6 +136,10 @@ import defaultInfo from '../modules/defaultInfo.vue'
             label:'运费状态',
             value:this.mainData.freightstatus
           },
+          {
+          label:'回签单',
+            value:this.mainData.signbackstatus
+          },
           {
             label:'备注',
             value:this.mainData.remarks

src/HDrpManagement/dispatch/modules/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-button size="small" type="primary" @click="onShow(dialogTableVisible = true)">新建发货单</el-button>
-    <el-dialog append-to-body title="选择发货订单" :visible.sync="dialogTableVisible" width="700px">
+    <el-dialog append-to-body title="选择发货订单" :visible.sync="dialogTableVisible" width="1000px">
       <el-input style="width:200px;" class="mt-10 inline-16" placeholder="请输入" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" size="small" clearable>
       </el-input>
       <el-date-picker
@@ -23,6 +23,8 @@
       </el-date-picker>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号"></el-table-column>
+        <el-table-column prop="projectname" label="项目名称"></el-table-column>
+        <el-table-column prop="projectnodes" label="项目备注"></el-table-column>
         <el-table-column prop="enterprisename" label="企业名称"></el-table-column>
         <el-table-column prop="checkdate" label="审核时间"></el-table-column>
         <el-table-column prop="remarks" label="备注"></el-table-column>

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -20,35 +20,39 @@
       </el-table-column> -->
       <el-table-column
         prop="rowno"
+        width="100px"
         label="发货单行号"
-      fixed>
+        fixed>
       </el-table-column>
       <el-table-column
         prop="orderRowno"
         width="100px"
         label="订单行号"
-      fixed>
+        fixed>
+      </el-table-column>
+      <el-table-column
+        prop="itemname"
+        label="产品名称"
+        fixed>
       </el-table-column>
       <el-table-column
         prop="itemno"
         fixed
         label="产品编码">
-      </el-table-column>
-       <el-table-column
-        prop="erpitemno"
-        label="erp编码">
-      </el-table-column>
-      <el-table-column
-        prop="itemname"
-        label="产品名称">
       </el-table-column>
       <el-table-column
         prop="erpitemno"
-        label="品号">
+        label="品号"
+        fixed>
       </el-table-column>
       <el-table-column
           prop="model"
-          label="型号">
+          label="型号"
+          fixed>
+      </el-table-column>
+       <el-table-column
+        prop="erpitemno"
+        label="erp编码">
       </el-table-column>
       <el-table-column
           prop="spec"
@@ -106,7 +110,7 @@
         width="120px"
         label="drp可发货数量">
       </el-table-column> -->
-      <el-table-column label="操作"  width="90">
+      <el-table-column label="操作"  width="90" fixed="right">
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
         </template>
@@ -275,6 +279,16 @@ export default {
       res.code === 1?fn():""
       
     },
+    // tableCellStyle({ row, column, rowIndex, columnIndex }) {
+    //   console.log(row.taskColor, "-->row.taskColor");
+    //   let rowBackground = {};
+    //   if (columnIndex === 10 || columnIndex == 13) {
+    //     rowBackground.background = 'yellow';
+    //   } else {
+    //     rowBackground.background = "#ffffff";
+    //   }
+    //   return rowBackground;
+    // },
   },
   mounted () {
     this.listData()
@@ -282,5 +296,8 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
+/* /deep/.el-table__fixed .el-table__row {
+  color: red !important;
+} */
 </style>

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/editmx.vue

@@ -15,6 +15,18 @@
         <el-form-item label="税率" prop="taxrate">
           <el-input v-model="form.taxrate" autocomplete="off"></el-input>
         </el-form-item>
+        <el-form-item label="商品编号" prop="itemno">
+          <el-input v-model="form.itemno" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="商品名称" prop="itemname">
+          <el-input v-model="form.itemname" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="规格型号" prop="spec">
+          <el-input v-model="form.spec" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="单位" prop="funit">
+          <el-input v-model="form.funit" autocomplete="off"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button size="small" @click="dialogFormVisible = false">取 消</el-button>
@@ -30,7 +42,18 @@ export default {
   data () {
     return {
       dialogFormVisible:false,
-      form:{},
+      form:{
+        "sa_invoicebill_itemid": '', 
+        "sa_invoiceapply_orderid":'',
+        "itemno": '', 
+        "itemname": '', 
+        "spec": '',
+        "price": '', 
+        "invoiceaqty": '', 
+        "invoiceamount": '',
+        "taxrate":'',
+        "funit":''
+      },
       rules: {
         price: [
           { required: true, message: '含税单价不能为空', trigger: 'blur' }
@@ -49,14 +72,16 @@ export default {
       this.form = {
         "sa_invoicebill_itemid": this.data.sa_invoicebill_itemid, 
         "sa_invoiceapply_orderid":this.data.sa_invoiceapply_orderid,
-        "itemno": this.data.itemno, 
-        "itemname": this.data.itemname, 
-        "spec": this.data.spec,
+        "itemno": this.data.goodscode, 
+        "itemname": this.data.goodsname, 
+        "spec": this.data.spectype,
         "price": this.data.price, 
         "invoiceaqty": this.data.num, 
         "invoiceamount": this.data.price * this.data.num,
-        "taxrate":this.data.taxrate
+        "taxrate":this.data.taxrate,
+        "funit":this.data.unit
       }
+      console.log(this.form,this.data);
       this.dialogFormVisible = true
     },
     countInvoiceamount () {
@@ -76,6 +101,7 @@ export default {
               "itemno": this.form.itemno, 
               "itemname": this.form.itemname, 
               "spec": this.form.spec,
+              "funit":this.form.funit,
               "price": this.form.price, 
               "invoiceaqty": this.form.invoiceaqty, 
               "invoiceamount": 0,

src/HDrpManagement/logistics/details/index.vue

@@ -147,6 +147,10 @@
             label:'经销商简称',
             value:this.mainData.enterprisename
           },
+          {
+          label:'回签单',
+            value:this.mainData.signbackstatus
+          },
           {
             label:'备注',
             value:this.mainData.remarks

src/HDrpManagement/logistics/modules/add.vue

@@ -33,10 +33,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="车牌号">
-          <el-input v-model.number="form.carnum" placeholder="车牌号"></el-input>
+          <el-input v-model="form.carnum" placeholder="车牌号"></el-input>
         </el-form-item>
         <el-form-item label="物流联系人">
-          <el-input v-model.number="form.logiscontact" placeholder="物流联系人"></el-input>
+          <el-input v-model="form.logiscontact" placeholder="物流联系人"></el-input>
         </el-form-item>
         <el-form-item label="物流电话">
           <el-input v-model.number="form.logisphone" placeholder="物流电话"></el-input>
@@ -45,7 +45,7 @@
           <el-input v-model.number="form.freightamount" placeholder="运费"></el-input>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model.number="form.remarks" placeholder="备注"></el-input>
+          <el-input v-model="form.remarks" placeholder="备注"></el-input>
         </el-form-item>
         <el-form-item label="单据日期" prop="billdate">
           <el-date-picker

src/HDrpManagement/logistics/modules/edit.vue

@@ -34,10 +34,10 @@ ed<template>
           </el-select>
         </el-form-item>
         <el-form-item label="车牌号">
-          <el-input v-model.number="form.carnum" placeholder="车牌号"></el-input>
+          <el-input v-model="form.carnum" placeholder="车牌号"></el-input>
         </el-form-item>
         <el-form-item label="物流联系人">
-          <el-input v-model.number="form.logiscontact" placeholder="物流联系人"></el-input>
+          <el-input v-model="form.logiscontact" placeholder="物流联系人"></el-input>
         </el-form-item>
         <el-form-item label="物流电话">
           <el-input v-model.number="form.logisphone" placeholder="物流电话"></el-input>
@@ -55,7 +55,7 @@ ed<template>
           </el-date-picker>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model.number="form.remarks" placeholder="备注"></el-input>
+          <el-input v-model="form.remarks" placeholder="备注"></el-input>
         </el-form-item>
       </el-form>
       <div class="mt-10">

src/HDrpManagement/orderManage/details/index.vue

@@ -307,6 +307,10 @@ export default {
           label:'erp单号',
           value:this.mainData.erpbillno
         },
+        {
+          label:'回签单',
+          value:this.mainData.signbackstatus
+        },
         {
           label:'项目备注',
           value:this.mainData.projectnote

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -29,42 +29,37 @@
         stripe
         border
         @selection-change	="selectionChange">
-        <el-table-column
+        <!-- <el-table-column
           type="selection"
           width="55"
           fixed="left"
           align="center">
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
-            prop="rowno"
-            label="行号"
-            width="50"
-            fixed="left">
+          prop="rowno"
+          width="100px"
+          label="订单行号"
+          fixed>
         </el-table-column>
         <el-table-column
           prop="itemname"
           label="产品名称"
-          width="180"
-          fixed="left">
+          fixed>
         </el-table-column>
         <el-table-column
           prop="itemno"
-          label="产品编号"
-          width="180"
-          fixed="left">
+          fixed
+          label="产品编码">
         </el-table-column>
         <el-table-column
           prop="erpitemno"
-          label="erp编号"
-          width="180">
+          label="品号"
+          fixed>
         </el-table-column>
         <el-table-column
             prop="model"
-          label="型号"
-          width="150">
-          <template slot-scope="scope">
-            <p><span>{{scope.row.model}}</span></p>
-          </template>
+            label="型号"
+            fixed>
         </el-table-column>
         <el-table-column
             prop="spec"
@@ -738,7 +733,7 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
 body .el-table th.gutter{
 display: table-cell!important;
 }

src/HDrpManagement/writeoffbill/modules/order/addOrder.vue

@@ -104,6 +104,7 @@ export default {
     async getOrderList () {
       this.params.content.sys_enterpriseid = this.data.sys_enterpriseid
       this.params.content.sa_accountclassid = this.data.sa_accountclassid
+      this.params.content.sa_writeoffbillid = this.$route.query.id
       let res = await this.$api.requested(this.params)
       this.orderList = res.data
       this.total = res.total

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -35,33 +35,30 @@
         align="center">
       </el-table-column> -->
       <el-table-column
-          prop="rowno"
-          label="行号"
-          fixed
-          width="50">
+        prop="rowno"
+        width="100px"
+        label="订单行号"
+        fixed>
       </el-table-column>
       <el-table-column
         prop="itemname"
         label="产品名称"
-        fixed
-        width="180">
+        fixed>
       </el-table-column>
       <el-table-column
         prop="itemno"
-        label="产品编号"
-        width="180">
+        fixed
+        label="产品编码">
       </el-table-column>
       <el-table-column
         prop="erpitemno"
-        label="erp编号"
-        width="180">
+        label="品号"
+        fixed>
       </el-table-column>
       <el-table-column
-        label="型号"
-        prop="model">
-        <template slot-scope="scope">
-          <p><span>{{scope.row.model}}</span></p>
-        </template>
+          prop="model"
+          label="型号"
+          fixed>
       </el-table-column>
       <el-table-column
           label="规格"
@@ -576,5 +573,5 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
 </style>

src/SDrpManagement/salerOrder/details/index.vue

@@ -11,7 +11,7 @@
         delApiId="20221108152102"
         tags=""
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'},{key:'status',value:'关闭'}]"
-        :tabs="['订单明细','基本信息','订单进度','居间费明细','物流单','发票记录','收支明细']"
+        :tabs="['订单明细','基本信息','订单进度','居间费明细','物流单','发票记录','收支明细','核销记录']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation" class="inline-16">
@@ -55,9 +55,12 @@
       <div slot="slot5">
         <invoiceTable></invoiceTable>
       </div>
-       <div slot="slot6">
+      <div slot="slot6">
         <revenue :data="mainData"></revenue>
       </div>
+      <div slot="slot7">
+        <writeOff :data="mainData"></writeOff>
+      </div>
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
       <el-input v-model="backreason" type="textarea" placeholder="请输入退回原因"></el-input>
@@ -80,6 +83,7 @@ import dispatch from './tabs/dispatch.vue'
 import invoiceTable from './tabs/invoiceTable.vue'
 import revenue from './tabs/revenueAndExp.vue'
 import importFile from '../modules/importFile.vue'
+import writeOff from './tabs/writeoff.vue'
 
 export default {
   name: "detail",
@@ -107,7 +111,8 @@ export default {
     logistics,
     invoiceTable,
     revenue,
-    importFile
+    importFile,
+    writeOff
   },
   methods:{
     async queryMainData(id) {

src/SDrpManagement/salerOrder/details/tabs/writeoff.vue

@@ -0,0 +1,110 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      size="small"
+      border>
+      <el-table-column
+        prop="billno"
+        label="核销单号"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="billnodate"
+        label="核销日期"
+        width="160">
+      </el-table-column>
+      <el-table-column
+        prop="cashbillbillno"
+        label="收入凭证号">
+      </el-table-column>
+      <el-table-column
+        prop="writeoffamount"
+        label="核销单总金额">
+      </el-table-column>
+      <el-table-column
+        prop="rowno"
+        label="订单行号">
+      </el-table-column>
+      <el-table-column
+        prop="itemno"
+        label="产品编码">
+      </el-table-column>
+      <el-table-column
+        prop="itemname"
+        label="产品名称">
+      </el-table-column>
+      <el-table-column
+        prop="ordetitemwriteoffamount"
+        label="本次核销金额">
+      </el-table-column>
+    </el-table>
+    <div class="container normal-panel" style="text-align:right">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-sizes="[20, 50, 100, 200]"
+        layout="total,sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils'
+export default {
+  data () {
+    return {
+      tableData:[],
+      param:{
+        "id": "20230225141804",
+        "content": {
+            "sa_orderid": 14,
+            "pageSize":20,
+            "pageNumber":1
+
+        }
+      },
+      total:0,
+      currentPage:0,
+    }
+  },
+  methods:{
+    async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData,'核销记录');
+      
+    },
+    handleSizeChange(val) {
+      this.param.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      this.param.pageNumber = val
+      this.listData()
+    },
+    linkDetail (item) {
+        let route = this.$route
+        if (route.path !== '/taskDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({path:'/dispatchdetail',query:{id:item.sa_dispatchid,rowindex:item.rowindex}})
+      }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -35,33 +35,30 @@
         align="center">
       </el-table-column> -->
       <el-table-column
-          prop="rowno"
-          label="行号"
-          fixed
-          width="50">
+        prop="rowno"
+        width="100px"
+        label="订单行号"
+        fixed>
       </el-table-column>
       <el-table-column
         prop="itemname"
         label="产品名称"
-        fixed
-        width="180">
+        fixed>
       </el-table-column>
       <el-table-column
         prop="itemno"
-        label="产品编号"
-        width="180">
+        fixed
+        label="产品编码">
       </el-table-column>
       <el-table-column
         prop="erpitemno"
-        label="erp编号"
-        width="180">
+        label="品号"
+        fixed>
       </el-table-column>
       <el-table-column
-        label="型号"
-        prop="model">
-        <template slot-scope="scope">
-          <p><span>{{scope.row.model}}</span></p>
-        </template>
+          prop="model"
+          label="型号"
+          fixed>
       </el-table-column>
       <el-table-column
           label="规格"
@@ -612,5 +609,5 @@ export default {
 }
 
 </script>
-<style>
+<style scoped>
 </style>

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -42,8 +42,8 @@
       </el-popover>
     </div>
     <div style="padding:10px">
-      <div class="flex-align-center" style="margin-bottom:16px" v-show="men.isleader === 0" v-for="men in item.team" :key="men.index">
-        <div class="avatar inline-16"  :class="men.isleader === 1?'leader':''" >
+      <div class="flex-align-center" style="margin-bottom:16px" v-show="men.isdefault === 0" v-for="men in item.team" :key="men.index">
+        <div class="avatar inline-16"  :class="men.isdefault === 1?'leader':''" >
           <img class="avatar__image" v-if="men.headpic" :src="men.headpic" alt="">
           <p v-else>{{men.name.substr(0, 1)}}</p>
         </div>

src/template/invoiceCanUseProduct/index.vue

@@ -17,7 +17,7 @@
       <el-table-column
         type="selection"
         width="55"
-      fixed>
+        fixed>
       </el-table-column>
       <el-table-column
           prop="rowno"