lilei 2 年之前
父節點
當前提交
f6134dbb54

+ 1 - 1
public/version.json

@@ -1,5 +1,5 @@
 {
   "message": "发现有新版本发布,确定更新系统?",
   "vendorJsVersion": "",
-  "version": 1684402992122
+  "version": 1684484110135
 }

+ 7 - 1
src/views/financialManagement/companyReceivablePayableNew/chooseBillModal.vue

@@ -47,7 +47,8 @@
         </a-form>
       </div>
       <div class="btn-cont">
-        <a-button type="primary" ghost id="chooseBillModal-modal-save" @click="handleSave">批量添加</a-button>
+        <a-button type="primary" id="chooseBillModal-modal-save" @click="handleSave">批量添加</a-button>
+        <a-button v-if="nowChoose.length" type="primary" ghost style="margin-left: 15px;" id="chooseBillModal-modal-reSel" @click="handleReSel">重新选择</a-button>
         <span v-if="totalNums" style="margin-left: 15px;">已选{{ totalNums }}项</span>
       </div>
       <!-- 列表 -->
@@ -162,6 +163,11 @@ export default {
       console.log(obj)
       this.rowSelectionInfo = obj || null
     },
+    // 重新选择
+    handleReSel(){
+      this.$emit('ok', [])
+      this.resetSearchForm()
+    },
     // 关联单据创建时间
     createDateChange (date) {
       this.queryParam.bizCreateBeginDate = date[0]

+ 12 - 5
src/views/financialManagement/companyReceivablePayableNew/collectionPayment.vue

@@ -16,6 +16,8 @@
               </div> -->
             </PrintPanel>
             <a-divider type="vertical" />
+            <a-button id="salesNewOrderEdit-del-btn" class="button-default" type="link" @click="handleOk([])"><a-icon type="close" />清空单据</a-button>
+            <a-divider type="vertical" />
             <a-button id="salesNewOrderEdit-add-btn" type="link" @click="openModal=true"><a-icon type="plus" />选择单据</a-button>
           </div>
         </template>
@@ -410,11 +412,16 @@ export default {
       })
     },
     handleOk (selectedRows) {
-      this.chooseLoadData = this.chooseLoadData.concat(selectedRows).sort((a, b) => {
-        const at = new Date(a.auditTime).getTime()
-        const bt = new Date(b.auditTime).getTime()
-        return at - bt
-      })
+      if(selectedRows.length){
+        this.chooseLoadData = this.chooseLoadData.concat(selectedRows).sort((a, b) => {
+          const at = new Date(a.auditTime).getTime()
+          const bt = new Date(b.auditTime).getTime()
+          return at - bt
+        })
+      }else{
+        this.chooseLoadData = selectedRows
+      }
+      
       this.amountSettledChange()
     },
     // 返回列表

+ 1 - 1
src/views/salesManagement/salesQuery/edit.vue

@@ -145,7 +145,7 @@
           <!-- 产品名称 -->
           <template slot="productName" slot-scope="text, record">
             <a-tag color="blue" v-if="record.shelfPlaceCode">{{ record.shelfPlaceCode }}</a-tag>
-            <span>{{ text }}</span>
+            <span :title="text">{{ text }}</span>
           </template>
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">

+ 1 - 1
src/views/salesManagement/salesQueryNew/edit.vue

@@ -135,7 +135,7 @@
           <!-- 产品名称 -->
           <template slot="productName" slot-scope="text, record">
             <a-tag color="blue" v-if="record.shelfPlaceCode">{{ record.shelfPlaceCode }}</a-tag>
-            <span>{{ text }}</span>
+            <span :title="text">{{ text }}</span>
           </template>
           <!-- 产品编码 -->
           <template slot="productCode" slot-scope="text, record">