Bladeren bron

Merge branch 'blueBranch' into testToMerge

qymljy 1 jaar geleden
bovenliggende
commit
e60bdaafee

+ 3 - 3
src/HDrpManagement/dispatch/details/index.vue

@@ -15,7 +15,7 @@
       <div slot="tags">
       </div>
       <div slot="customOperation">
-        <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="onSuccess" />
+        <Edit class="inline-16" style="margin-left: -10px" v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" :data="mainData" @onSuccess="onSuccess" />
         <el-button class="inline-16" :type="mainData.status !== '复核'?'':'primary'" size="mini"  v-if="tool.checkAuth($route.name,'createBill') && (mainData.status == '新建' || mainData.status == '提交' || mainData.status == '复核')" :disabled="mainData.status !== '复核'" @click="addLogistics">{{$t(`生成物流单`)}}</el-button>
         <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'submit') && mainData.status == '新建'" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" content="是否确定提交发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
         <confirmSelection class="inline-16" v-if="tool.checkAuth($route.name,'revocation') && mainData.status == '提交'" btnTitle="撤回" :disabled="mainData.status !== '提交'" btnType="primary" content="是否确定撤回发货单" confirmButtonText="确定" cancelButtonText="取消" paramId="2024120915580002" idName="sa_dispatchid" @onSuccess="onSuccess"></confirmSelection>
@@ -85,7 +85,7 @@ import defaultInfo from '../modules/defaultInfo.vue'
           },
           {
             label:'发货日期',
-            value:this.mainData.billdate
+            value:this.mainData.billdate?this.mainData.billdate:'--'
           },
           {
             label:'企业编号',
@@ -109,7 +109,7 @@ import defaultInfo from '../modules/defaultInfo.vue'
           },
           {
             label:'发货数量',
-            value:this.mainData.qty
+            value:this.mainData.qty?this.mainData.qty:'--'
           },
           {
             label:'发货金额',

+ 1 - 1
src/HDrpManagement/dispatch/index.vue

@@ -50,7 +50,7 @@
             {{ scope.data.column.data.sumqty ? tool.formatAmount(scope.data.column.data.sumqty,0) : '--' }}
           </div>
           <div v-else>
-            {{$t(scope.data.column.data[[scope.data.column.columnname]])}}
+            {{$t(scope.data.column.data[[scope.data.column.columnname]]) || '--'}}
           </div>
         </template>
         <template v-slot:tbOpreation="scope">

+ 30 - 19
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.data.billdate?this.data.billdate:this.siteid == 'YOSTEST1' || this.siteid == 'HY'?'':(new Date()).toISOString().split('T')[0]
       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()

+ 3 - 2
src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -81,8 +81,9 @@ export default {
         },
       })
       this.rebHeadData = res.data
-      this.activeName = res.data.length > 1?res.data[0].title:''
-      this.sa_rebatesettlementid = res.data.length > 1?res.data[0].sa_rebatesettlementid:''
+      console.log(this.rebHeadData,'data数据')
+      this.activeName = res.data.length > 0?res.data[0].title:''
+      this.sa_rebatesettlementid = res.data.length > 0?res.data[0].sa_rebatesettlementid:''
       this.sa_rebatesettlementid?this.listData():''
     },
     async listData () {

+ 1 - 0
src/HDrpManagement/orderManage/index.vue

@@ -23,6 +23,7 @@
           <p class="search__label">{{$t(`状态`)}}:</p>
           <el-select v-model="where.status" clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择状态`)" @change="change">
             <el-option :label="$t(`新建`)" value="新建"></el-option>
+            <el-option :label="$t(`预提交`)" value="预提交"></el-option>
             <el-option :label="$t(`提交`)" value="提交"></el-option>
             <el-option :label="$t(`交期待确认`)" value="交期待确认"></el-option>
             <el-option :label="$t(`交期确认`)" value="交期确认"></el-option>

+ 6 - 0
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()

+ 1 - 0
src/SDrpManagement/agentOrder/index.vue

@@ -18,6 +18,7 @@
           <p class="search__label">{{$t('订单状态')}}:</p>
           <el-select v-model="status" clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择订单状态`)" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
             <el-option value="新建" :label="$t(`新建`)"></el-option>
+            <el-option value="预提交" :label="$t(`预提交`)"></el-option>
             <el-option value="提交" :label="$t(`提交`)"></el-option>
             <el-option value="审核" :label="$t(`审核`)"></el-option>
             <el-option value="交期待确认" :label="$t(`交期待确认`)"></el-option>

+ 6 - 0
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()

+ 1 - 1
src/optionSystem/FProductManage/modules/aside.vue

@@ -204,4 +204,4 @@ export default {
     display: flex;
     flex-direction: column;
 }
-</style>
+</style>