订单核销、收入凭证调整

src/HDrpManagement/writeoffbill/index.vue

@@ -29,7 +29,7 @@
             <el-option label="审核" value="审核"></el-option>
           </el-select>
         </div>
-        <div class="mt-10">
+<!--        <div class="mt-10">
           <label class="search__label" >单据日期:</label>
           <el-date-picker
               style="margin-right: 24px !important;"
@@ -43,7 +43,7 @@
               end-placeholder="结束日期"
               clearable>
           </el-date-picker>
-        </div>
+        </div>-->
         <div class="mt-10">
           <label class="search__label" >审核时间:</label>
           <el-date-picker

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

@@ -25,6 +25,12 @@
           <span v-else-if="scope.column.columnname == 'unwriteoffamount'">
             {{'¥ '+ tool.formatAmount(scope.column.data.unwriteoffamount,2)}}
           </span>
+          <span v-else-if="scope.column.columnname == 'price'">
+            {{'¥ '+ tool.formatAmount(scope.column.data.price,2)}}
+          </span>
+          <span v-else-if="scope.column.columnname == 'amount'">
+            {{'¥ '+ tool.formatAmount(scope.column.data.amount,2)}}
+          </span>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
           <p v-if="!scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname] !== 0 && scope.column.columnname != 'operation'">--</p>
         </template>

src/HManagement/addressList/mycontact/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div>
-    <div class="flex-align-stretch">
+    <div class="flex-align-stretch" >
+
       <group ref="grouplist" :data="list" @setGroupData="setGroupData" @clickGroup="clickGroup">
         <add-contact :tagList="tagList" v-if="tool.checkAuth($route.name,'addContact')" slot="addContact" :group="group" @onAddSuccess="onAddSuccess"></add-contact>
         <add-group v-if="tool.checkAuth($route.name,'addGroup')" slot="addGroup" @onSuccess="onAddSuccess"></add-group>
@@ -11,7 +12,8 @@
           <delGroup v-if="tool.checkAuth($route.name,'deleteGroup')" :data="scope.data" @onSuccess="onAddSuccess"></delGroup>
         </template>
       </group>
-      <contacts style="flex:1 0 auto" :data="activeGroupData" :tags="tagsList" :editIndex="editIndex" ref="contacts" @clickContacts="clickContacts" @filtetContacts="filtetContacts"></contacts>
+
+      <contacts style="flex:1 0 auto" :data="activeGroupData" :tags="tagsList" :activeContactsData="activeContactsData" :editIndex="editIndex" ref="contacts" @clickContacts="clickContacts" @filtetContacts="filtetContacts"></contacts>
       <detail :activeContactsData="activeContactsData">
         <template v-slot:edit="data">
           <edit :tagList="tagList" v-if="tool.checkAuth($route.name,'update') " :data="data" :group="group" :allGroup="allGroup" :tagsList="tagsList" @onEditSuccess="onEditSuccess"></edit>
@@ -20,6 +22,9 @@
           <ondel v-if="tool.checkAuth($route.name,'delete') " :data="data" @onDelSuccess="onDelSuccess"></ondel>
         </template>
       </detail>
+
+
+
     </div>
   </div>
 </template>

src/HManagement/addressList/mycontact/modules/contacts.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="normal-panel scroll-panel" style="width: calc(50vh - 400px)">
+  <div class="normal-panel scroll-panel" style="width: calc((100vh - 400px) / 2)">
     <div class="container" style="border-bottom:1px solid #f1f2f3;padding: 16px 16px 6px 16px">
 <!--      <el-form class="myform" size="small" inline label-position="right" label-width="50px">
         <el-form-item label="搜索">-->
@@ -54,7 +54,7 @@
 
 <script>
 export default {
-  props:['data','tags','editIndex'],
+  props:['data','tags','editIndex','activeContactsData'],
   data () {
     return {
       active:0,

src/HManagement/addressList/mycontact/modules/detail.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-if="activeContactsData" class="normal-panel scroll-panel" style="width:calc(100vh - 400px)">
+  <div v-if="activeContactsData" class="normal-panel scroll-panel" style="width: calc((100vh - 400px) / 2);">
     <div class="container border flex-align-center flex-between">
       <div class="flex-align-stretch">
         <div class="avatar">