zhangqiOMG %!s(int64=2) %!d(string=hai) anos
pai
achega
c00422f5dc

+ 9 - 5
src/HDrpManagement/dispatch/index.vue

@@ -40,16 +40,20 @@
             <el-option label="手工关闭" value="手工关闭"></el-option>
           </el-select>
         </div>
-        <div class="mt-10 inline-16">
-          <!-- <label class="search__label" >发货日期:</label> -->
-          <el-input size="small" v-model="value" placeholder="根据品号或订单号查询" @keydown.native.enter="queryList" clearable></el-input>
+        <div class="mt-10">
+          <label class="search__label" >单号:</label>
+          <el-input size="small" style="width:200px;" class="inline-16" v-model="value" placeholder="根据品号或订单号查询" @keydown.native.enter="queryList" clearable></el-input>
         </div>
         <div class="mt-10">
-          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon=" agentinfo?agentinfo.length > 0?'':'':'el-icon-search'" v-model="agentinfo" @keyup.native.enter="queryList" @clear="queryList" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          <label class="search__label" >经销商:</label>
+          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon=" agentinfo?agentinfo.length > 0?'':'':'el-icon-search'" v-model="agentinfo"
+                    @keyup.native.enter="queryList" @clear="queryList" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
         <div class="mt-10">
-          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="remarks?remarks.length > 0?'':'':'el-icon-search'" v-model="remarks" @keyup.native.enter="queryList" @clear="queryList" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          <label class="search__label" >备注:</label>
+          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="remarks?remarks.length > 0?'':'':'el-icon-search'" v-model="remarks"
+                    @keyup.native.enter="queryList" @clear="queryList" size="small" class="input-with-select inline-24 layout_search__panel" clearable>
           </el-input>
         </div>
       </template>

+ 7 - 3
src/HDrpManagement/orderManage/index.vue

@@ -54,7 +54,7 @@
         <div class="mt-10">
           <label class="search__label" >单据日期:</label>
           <el-date-picker
-              style="margin-right: 24px !important;"
+              style="margin-right: 16px !important;"
               size="small"
               @change="selectChange"
               value-format="yyyy-MM-dd"
@@ -67,11 +67,15 @@
           </el-date-picker>
         </div>
         <div class="mt-10">
-          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon="where.agentinfo?where.agentinfo.length > 0?'':'':'el-icon-search'" v-model="where.agentinfo" @keyup.native.enter="change" @clear="change" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          <p class="search__label">经销商:</p>
+          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon="where.agentinfo?where.agentinfo.length > 0?'':'':'el-icon-search'" v-model="where.agentinfo"
+                    @keyup.native.enter="change" @clear="change" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
         <div class="mt-10">
-          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="where.remarks?where.remarks.length > 0?'':'':'el-icon-search'" v-model="where.remarks" @keyup.native.enter="change" @clear="change" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          <p class="search__label">备注:</p>
+          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="where.remarks?where.remarks.length > 0?'':'':'el-icon-search'" v-model="where.remarks"
+                    @keyup.native.enter="change" @clear="change" size="small" class="input-with-select inline-24 layout_search__panel" clearable>
           </el-input>
         </div>
       </template>

+ 17 - 8
src/HDrpManagement/orderManage/modules/add.vue

@@ -70,8 +70,8 @@
             <el-col :span="12"  v-if="form.type !=='工具订单' && form.type !=='项目订单' && form.typemx !== '工程' && form.typemx !== '电商'">
               <el-form-item label="选择领域" prop="tradefield">
                 <el-select :disabled="form.type==='促销订单'" v-model="form.tradefield" placeholder="请选择选择领域" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in tradefieldOptions" :key="index" :label="item.tradefield"
-                    :value="item.tradefield" @click.native="setChildField(item)"></el-option>
+                  <el-option v-for="(item, index) in tradefieldOptions" :key="index" :label="item.value"
+                    :value="item.value" @click.native="setChildField(item)"></el-option>
                 </el-select>
               </el-form-item>
             </el-col>
@@ -106,7 +106,7 @@ export default {
       visible1:false,
       form:{
         "sa_orderid": 0,
-        "sys_enterpriseid": 0, //订货企业id,可不传,默认取当前账号的
+        "sys_enterpriseid": '', //订货企业id,可不传,默认取当前账号的
         "sa_accountclassid": 0, //营销账户类型ID
         "sa_brandid": "", //品牌ID
         "sa_contractid": 0, //合同ID,标准订单不传
@@ -145,7 +145,7 @@ export default {
         sys_enterpriseid:[{
           required: true,
           message: '订货经销商不能为空',
-          trigger: 'blur'
+          trigger: 'change'
         }],
         sa_contractid:[{
           required: true,
@@ -201,6 +201,7 @@ export default {
       this.drawer = true
       this.specordermx()
       this.accountType()
+      this.queryTradefield()
     },
     submitForm() {
       console.log(this.form)
@@ -236,18 +237,26 @@ export default {
       })
       this.sa_brandidOptions = res.data
 
-      const res1 = await this.$api.requested({
+      /*const res1 = await this.$api.requested({
         "id": 20230219212802,
         "content": {
           "sys_enterpriseid": this.form.sys_enterpriseid,
         }
-      })
-      this.tradefieldOptions = res1.data
+      })*/
 
-      this.form.tradefield = this.tradefieldOptions[0]?this.tradefieldOptions[0].tradefield:''
+
+
+      /*this.form.tradefield = this.tradefieldOptions[0]?this.tradefieldOptions[0].tradefield:''*/
       this.childField = this.tradefieldOptions[0]?this.tradefieldOptions[0].subvalues:''
       this.form.sa_brandid = this.sa_brandidOptions[0]?this.sa_brandidOptions[0].sa_brandid:""
     },
+    queryTradefield(){
+      this.$store.dispatch('optiontypeselect','headquartersdomainclassification').then((res1)=>{
+        console.log(res1,'111111111111111111')
+        this.tradefieldOptions = res1.data
+        console.log(this.tradefieldOptions,'领域数据')
+      })
+    },
     rowClick (row) {
       this.form.sys_enterpriseid = row.sys_enterpriseid
       this.form.type === '促销订单'?this.$refs['activity'].listData(row.sys_enterpriseid):''

+ 7 - 3
src/HDrpManagement/payvoucher/index.vue

@@ -30,7 +30,7 @@
         <div class="mt-10">
           <label class="search__label" >单据日期:</label>
           <el-date-picker
-              style="margin-right: 24px !important;"
+              style="margin-right: 16px !important;"
               size="small"
               @change="selectChange"
               value-format="yyyy-MM-dd"
@@ -43,11 +43,15 @@
           </el-date-picker>
         </div>
         <div class="mt-10">
-          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon=" selectParam.agentinfo?selectParam.agentinfo.length > 0?'':'':'el-icon-search'" v-model="selectParam.agentinfo" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          <label class="search__label" >经销商:</label>
+          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon=" selectParam.agentinfo?selectParam.agentinfo.length > 0?'':'':'el-icon-search'" v-model="selectParam.agentinfo"
+                    @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
         <div class="mt-10">
-          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="selectParam.remarks?selectParam.remarks.length > 0?'':'':'el-icon-search'" v-model="selectParam.remarks" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          <label class="search__label" >备注:</label>
+          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="selectParam.remarks?selectParam.remarks.length > 0?'':'':'el-icon-search'" v-model="selectParam.remarks"
+                    @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-24 layout_search__panel" clearable>
           </el-input>
         </div>
       </template>

+ 1 - 1
src/HDrpManagement/promotion/modules/detail.vue

@@ -86,7 +86,7 @@ import Edit from '@/Form/promotion/edit'
 import BaseInfo from '@/components/detailInfo/index.vue'
 import Check from '../components/check'
 import Send from '../components/send'
-import Close from '../components/close'
+import Close from '../components/close.vue'
 import promotionModel from './productModel/index.vue'
 import addModel from './productModel/add.vue'
 import productDetail from './productModel/productDetail.vue'

+ 10 - 6
src/HDrpManagement/recvoucher/index.vue

@@ -16,21 +16,21 @@
       </template>
       <template #custom>
         <div class="mt-10">
-          <label class="search__label " style="margin: auto;width: 70px;">账户类型:</label>
+          <label class="search__label " >账户类型:</label>
           <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.accountname" placeholder="请选择账户类型" size="small" clearable>
             <el-option v-for="(item,index) in accountNameList" :key="index" :value="item.accountname" :label="item.accountname"></el-option>
           </el-select>
         </div>
         <div class="mt-10">
-          <label class="search__label " style="margin: auto;width: 35px;">状态:</label>
+          <label class="search__label " >状态:</label>
           <el-select style="margin-right: 24px !important;" class="inline-16" @change="selectChange" v-model="selectParam.status" placeholder="请选择状态" size="small" clearable>
             <el-option v-for="(item,index) in statusData" :key="index" :value="item.value" :label="item.value"></el-option>
           </el-select>
         </div>
         <div class="mt-10">
-          <label class="search__label" style="margin: auto;width: 65px;">单据日期:</label>
+          <label class="search__label" >单据日期:</label>
           <el-date-picker
-              style="margin-right: 24px !important;"
+              style="margin-right: 16px !important;"
               size="small"
               @change="selectChange"
               value-format="yyyy-MM-dd"
@@ -43,11 +43,15 @@
           </el-date-picker>
         </div>
         <div class="mt-10">
-          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon=" selectParam.agentinfo?selectParam.agentinfo.length > 0?'':'':'el-icon-search'" v-model="selectParam.agentinfo" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          <label class="search__label" >经销商:</label>
+          <el-input style="width:200px;" placeholder="根据经销商搜索" :suffix-icon=" selectParam.agentinfo?selectParam.agentinfo.length > 0?'':'':'el-icon-search'" v-model="selectParam.agentinfo"
+                    @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
           </el-input>
         </div>
         <div class="mt-10">
-          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="selectParam.remarks?selectParam.remarks.length > 0?'':'':'el-icon-search'" v-model="selectParam.remarks" @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-16 layout_search__panel" clearable>
+          <label class="search__label" >备注:</label>
+          <el-input style="width:200px;" placeholder="根据订单备注搜索" :suffix-icon="selectParam.remarks?selectParam.remarks.length > 0?'':'':'el-icon-search'" v-model="selectParam.remarks"
+                    @keyup.native.enter="selectChange" @clear="selectChange" size="small" class="input-with-select inline-24 layout_search__panel" clearable>
           </el-input>
         </div>
       </template>

+ 1 - 1
yos/index.html

@@ -1 +1 @@
-<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.e428fee0.js"></script><script defer="defer" type="module" src="js/app.5df4e3e2.js"></script><link href="css/app.27f5aad7.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.0beef1e9.js" nomodule></script><script defer="defer" src="js/app-legacy.f23046d0.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body><head><meta http-equiv="pragma" content="no-cache"></head></html>
+<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><title>yos_manage</title><script defer="defer" type="module" src="js/chunk-vendors.e428fee0.js"></script><script defer="defer" type="module" src="js/app.cd377292.js"></script><link href="css/app.27f5aad7.css" rel="stylesheet"><script defer="defer" src="js/chunk-vendors-legacy.0beef1e9.js" nomodule></script><script defer="defer" src="js/app-legacy.726760e0.js" nomodule></script></head><body><noscript><strong>We're sorry but yos_manage doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body><head><meta http-equiv="pragma" content="no-cache"></head></html>

BIN=BIN
yos/归档.zip