Merge branch 'xiaoqin' into mergeBranch

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

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status !== '新建'" size="small" type="primary" @click="onShow">添加开票明细行</el-button>
+    <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status =! '提交' && status != '新建'" size="small" type="primary" @click="onShow">添加开票明细行</el-button>
     <el-dialog title="选择开票明细行" :visible.sync="dialogTableVisible" append-to-body>
       <el-table :data="list" size="mini" border>
         <el-table-column prop="sonum" label="订单号" width="150"></el-table-column>

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/index.vue

@@ -1,11 +1,11 @@
 <template>
   <div>
     <el-button-group v-if="tool.checkAuth($route.name,'editBlueInvioce')" style="margin-bottom:10px">
-      <el-button size="small" type="primary" :disabled="data.status !== '新建'" @click="addInvoiceapp">一键添加发票</el-button>
-      <el-button size="small" type="primary" :disabled="data.status !== '新建'" @click="addInvoiceapp2">添加发票</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 || data.status !== '审核' || data.byhand !== 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 || data.status !== '审核' || data.byhand !== 0" @click="clickInvioceQuery">发票创建查询</el-button>
-      <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  data.status !== '审核'" @click="blueInvioceToRed">红冲勾选行</el-button>
+      <el-button size="small" type="primary" :disabled="data.status =! '提交' && data.status != '审核'" @click="addInvoiceapp">一键添加发票</el-button>
+      <el-button size="small" type="primary" :disabled="data.status =! '提交' && data.status != '审核'" @click="addInvoiceapp2">添加发票</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status =! '提交' && data.status != '审核') || data.byhand !== 0" @click="clickCreateBlueInvioce">勾选创建发票</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 || (data.status =! '提交' && data.status != '审核') || data.byhand !== 0" @click="clickInvioceQuery">发票创建查询</el-button>
+      <el-button size="small" type="primary" :disabled="selectData.length === 0 ||  (data.status =! '提交' && data.status != '审核')" @click="blueInvioceToRed">红冲勾选行</el-button>
     </el-button-group>
     <invoiceTable :data="data" ref="invoiceTable" @activeRow="activeRow" @selection="selection"></invoiceTable>
     <invoiceTablemx :status="data.status" ref="invoiceTablemx" @onSuccess="mxOnSuccess"></invoiceTablemx>

src/HDrpManagement/logistics/modules/add.vue

@@ -15,7 +15,7 @@
           <enterprise :qiyi="true" ref="ent" @rowClick="entRowClick"></enterprise>
         </el-form-item>
         <el-form-item label="物流公司">
-          <logisticcom ref="logis" @logisticRowClick="logisticRowClick"></logisticcom>
+          <logisticcom ref="logis" :ID="true" @logisticRowClick="logisticRowClick"></logisticcom>
         </el-form-item>
         <el-form-item label="物流单号">
           <el-input v-model="form.billno" placeholder="物流单号"></el-input>

src/HDrpManagement/logistics/modules/edit.vue

@@ -16,7 +16,7 @@ ed<template>
         </el-form-item>
         <el-form-item label="物流公司">
           <!-- <el-input v-model="form.logic" placeholder="物流公司"></el-input> -->
-          <logisticcom ref="logis" @logisticRowClick="logisticRowClick"></logisticcom>
+          <logisticcom :ID="true" ref="logis" @logisticRowClick="logisticRowClick"></logisticcom>
         </el-form-item>
         <el-form-item label="物流单号">
           <el-input v-model="form.logisticno" placeholder="物流单号"></el-input>

src/template/selectLogisticcom/index.vue

@@ -50,8 +50,10 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 // import addTemp from '@/Form/EnterpriseArchives/add.vue'
 export default {
+  props:['ID'],
   components:{
   },
   data () {
@@ -92,7 +94,7 @@ export default {
     },
     rowClick (row) {
       this.visible = false
-      this.form.abbreviation = row.abbreviation
+      this.form.abbreviation = this.ID ? row.kd100id : this.abbreviation
       this.$emit('logisticRowClick',row)
     }
   },