发货单调整，应收账款、应收账款管理新增搜索

src/HDrpManagement/dispatch/modules/edit.vue

@@ -15,7 +15,7 @@
       <div class="normal-margin">{{$t(`发货数量`)}}:{{data.qty}}</div>
       <div class="normal-margin">{{$t(`发货金额`)}}:{{data.sumamount ? tool.formatAmount(data.sumamount,2) : '--'}}</div>
       <div class="mt-10">
-        <p class="normal-title inline-16">{{$t(`发货时间`)}}</p>
+        <p class="normal-title inline-16"><span v-if="siteid == 'YOSTEST1' || siteid == 'HY'" style="color: red">*</span><span>{{$t(`发货时间`)}}</span></p>
         <!-- billdate -->
         <el-date-picker
           v-model="defaultData.billdate"
@@ -181,7 +181,8 @@ export default {
           }
         }
       },
-      addresstotal:0
+      addresstotal:0,
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     }
   },
   methods:{
@@ -193,7 +194,7 @@ export default {
       this.receiveAddress()
       this.queryLogisticcom()
       this.defaultData.freightstatus = this.data.freightstatus
-      this.defaultData.billdate = this.data.billdate
+      this.defaultData.billdate = this.siteid == 'YOSTEST1' || this.siteid == 'HY'?'':this.data.billdate
       this.defaultData.remarks = this.data.remarks
     },
     async deleteContacts (row) {
@@ -230,22 +231,32 @@ export default {
     },
     async onSubmit() {
       console.log(this.data)
-      const res = await this.$api.requested({
-        "id": 20221114135203,
-        "content": {
-          "sa_dispatchid":this.data.sa_dispatchid,
-          "sa_orderid":0,
-          "sys_enterpriseid":this.data.sys_enterpriseid,
-          "rec_contactsid":this.defaultData.re_info.contactsid,
-          "billdate":this.defaultData.billdate,
-          "freightstatus":this.defaultData.freightstatus,
-          "remarks":this.defaultData.remarks
-        },
-      })
-      this.tool.showMessage(res,()=>{
-        this.$emit('onSuccess')
-        this.drawer = false
-      })
+      if (!this.defaultData.billdate){
+        this.$confirm('请填写发货时间！', '提示', {
+          showCancelButton:false,
+          confirmButtonText: '确定',
+          type: 'warning'
+        }).then(() => {
+        }).catch(() => {
+        });
+      }else {
+        const res = await this.$api.requested({
+          "id": 20221114135203,
+          "content": {
+            "sa_dispatchid":this.data.sa_dispatchid,
+            "sa_orderid":0,
+            "sys_enterpriseid":this.data.sys_enterpriseid,
+            "rec_contactsid":this.defaultData.re_info.contactsid,
+            "billdate":this.defaultData.billdate,
+            "freightstatus":this.defaultData.freightstatus,
+            "remarks":this.defaultData.remarks
+          },
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('onSuccess')
+          this.drawer = false
+        })
+      }
     },
     onDelSuccess () {
       this.$refs.addpro.listData()

src/HManagement/actsRecMag/index.vue

@@ -18,6 +18,8 @@
             <div class="mt-10 inline-16" style="margin-left: 20px">
               <departmentSalesperson ref="departmentSalesperson" class="inline-16" @depSelect="depSelect" @personSelect="personSelect" ></departmentSalesperson>
             </div>
+            <el-input  style="width:200px;" :placeholder="$t('搜索')" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="clearSearchValue" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+            </el-input>
             <div>
               <el-row :gutter="20">
                 <el-col :span="6" class="mt-10">
@@ -244,6 +246,10 @@ export default {
       this.param.content.pageNumber = val
       this.listData()
     },
+    clearSearchValue () {
+      this.$store.dispatch('clearSearchValue')
+      this.listData(this.param.content.pageNumber = 1)
+    }
   },
   mounted() {
     this.departmentrtment()

src/SManagement/actsRec/index.vue

@@ -17,6 +17,8 @@
             <div class="mt-10 inline-16" style="margin-left: 20px">
               <departmentSalesperson ref="departmentSalesperson" class="inline-16" @depSelect="depSelect" @personSelect="personSelect" ></departmentSalesperson>
             </div>
+            <el-input  style="width:200px;" :placeholder="$t('搜索')" :suffix-icon="param.content.where.condition?param.content.where.condition.length > 0?'':'':'el-icon-search'" v-model="param.content.where.condition" @keyup.native.enter="listData(param.content.pageNumber = 1)" @clear="clearSearchValue" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+            </el-input>
             <div>
               <el-row :gutter="20">
                 <el-col :span="6" class="mt-10">
@@ -242,6 +244,10 @@ export default {
       this.param.content.pageNumber = val
       this.listData()
     },
+    clearSearchValue () {
+      this.$store.dispatch('clearSearchValue')
+      this.listData(this.param.content.pageNumber = 1)
+    }
   },
   mounted() {
     this.departmentrtment()