Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/ProductGroupMag/modules/table.vue

@@ -128,7 +128,8 @@ export default {
             return {
               "sa_itemgroupmxid":0,
               "itemno":e.itemno,
-              "itemid":e.itemid
+              "itemid":e.itemid,
+              "sequence":e.sequence
             }
           })
         }

src/SDrpManagement/Products/modules/Select.vue

@@ -3,7 +3,7 @@
     <div>
       <ul class="flex-align-center normal-margin-new">
         <li :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField('')">全部领域</li>
-        <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
+        <li :class="field_act === item.tradefield?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin-new">
         <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">全部品牌</li>
@@ -58,6 +58,8 @@ export default {
         }
       })
       this.fields = res1.data
+      console.log(this.fields);
+      
       this.field_act = ''
     },
     async queryBrands () {
@@ -86,7 +88,7 @@ export default {
       this.queryClass()
     },
     clickField (item) {
-      this.field_act = item ? item.sys_enterprise_tradefieldid : ''
+      this.field_act = item ? item.tradefield : ''
       this.$emit('clickField',item)
     },
     clickClass (item) {

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/components/addorderline.vue

@@ -24,6 +24,11 @@
         <el-table-column prop="qty" label="订单数量" width="90"></el-table-column>
         <!-- <el-table-column prop="qty" label="发货数量"></el-table-column> -->
         <el-table-column prop="writeoffamount" label="已核销金额" width="120"></el-table-column>
+        <el-table-column label="可开票金额" width="120">
+          <template slot-scope="scope">
+          {{ scope.row.amount - scope.row.invoiceamount }}
+          </template>
+        </el-table-column>
         <el-table-column prop="invoiceamount" label="已开票金额" width="120"></el-table-column>
         <el-table-column prop="remarks" show-overflow-tooltip label="备注" width="150" ></el-table-column>
         <el-table-column label="操作" width="90" fixed="right">