Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/dispatch/modules/edit.vue

@@ -33,6 +33,7 @@
               title="选择地址"
               trigger="click"
               v-model="visible">
+              <addAddressInfo style="text-align:right" @onAddSuccess="receiveAddress()" :mainData="{sys_enterpriseid:data.sys_enterpriseid}"/>
               <el-table
                 :data="receiveAddresslist"
                 style="width: 100%"
@@ -109,12 +110,14 @@
 import previewImage from '@/components/previewImage/index.vue'
 import productList from './productlist.vue'
 import addDisProduct from '@/template/disCanUseProduct/index.vue'
+import addAddressInfo from '@/HManagement/marketing2/agent/details/modules/address/add'
 export default {
   props:['data'],
   components:{
     previewImage,
     productList,
-    addDisProduct
+    addDisProduct,
+    addAddressInfo
   },
   data () {
     return {
@@ -149,7 +152,8 @@ export default {
       const res = await this.$api.requested({
         "id": "20221009155803",
         "content": {
-        "sys_enterpriseid":this.data.sys_enterpriseid,
+          "nocache":true,
+          "sys_enterpriseid":this.data.sys_enterpriseid,
           "where":{
             "condition":"",
             "workaddress":0

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 =! '提交' && 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/components/editmx.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status !== '新建'" size="small" type="text" @click="onShow">修 改</el-button>
+    <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status" size="small" type="text" @click="onShow">修 改</el-button>
     <el-dialog title="修改明细信息" :visible.sync="dialogFormVisible" append-to-body width="400px">
       <el-form :model="form" size="small" :rules="rules" ref="form" label-position="right" label-width="90px">
         <el-form-item label="含税金额">

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

@@ -45,7 +45,7 @@
       </el-table-column>
       <el-table-column label="操作" width="90" fixed="right">
         <template slot-scope="scope">
-          <editmx class="inline-16" :status="status" :sa_invoicebillid="param.content.sa_invoicebillid" :data="scope.row" @onSuccess="onSuccess"></editmx>
+          <editmx class="inline-16" :status="(status !== '新建' && status !== '提交')" :sa_invoicebillid="param.content.sa_invoicebillid" :data="scope.row" @onSuccess="onSuccess"></editmx>
           <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status !== '新建' && status !== '提交'" size="small" type="text" @click="deleteRow(scope.row)">删 除</el-button>
         </template>
       </el-table-column>

src/HManagement/marketing2/agent/details/modules/address/add.vue

@@ -122,7 +122,7 @@ export default {
         "remarks":"",
         "workaddress":1,
         "value":[],
-        "isdefault":0
+        "isdefault":0,
       }
     }
   },