Merge branch 'testToMerge' of http://124.70.211.186:3000/zhangqi/yos_web into testToMerge

src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -52,6 +52,7 @@
         <el-descriptions-item :label="$t('产线')">{{ basic.prodline || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t('特殊说明')">{{ basic.specalnote || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`产品标准`)">{{ basic.standards || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`标准明细`)">{{ basic.standardsmx || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t(`重量`)">{{$t(`毛重`)}}:{{ basic.grossweight || '--'}};{{$t(`净重`)}}:{{basic.weight || '--'}}</el-descriptions-item>
 <!--        <el-descriptions-item  :label="$t(`条形码`)">{{ basic.barcode}}</el-descriptions-item>-->
         <el-descriptions-item  :label="$t(`是否序列号管理`)" >

src/HDrpManagement/ProductMag/index.vue

@@ -181,7 +181,7 @@
           <span :style="tool.getStatusColor(scope.data.column.data[[scope.data.column.columnname]])" >{{$t(scope.data.column.data[[scope.data.column.columnname]])}}</span>
         </p>
         <div v-else-if="scope.data.column.columnname === 'nominalpressure'">
-          <span v-if="scope.data.column.data.nominalpressure && scope.data.column.data.nominalpressure[0] != null">
+          <span v-if="scope.data.column.data.nominalpressure && scope.data.column.data.nominalpressure[0] != null && scope.data.column.data.nominalpressure[0] != '[]'">
             <span v-for="(item,index) in scope.data.column.data.nominalpressure" :key="index">
               <span v-if="index == scope.data.column.data.nominalpressure.length -1">
                 {{item}}

src/HDrpManagement/ProductMag/modules/add.vue

@@ -102,12 +102,24 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t(`产品标准`)">
-                <el-select style="width:100%" v-model="form.standards" :placeholder="$t('请选择')" clearable>
+                <el-select style="width:100%" v-model="form.standards" :placeholder="$t('请选择')" clearable @change="standardChange">
                   <el-option
                     v-for="item in standards"
                     :key="item.value"
                     :label="$t(item.value)"
-                    :value="item.value">
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t(`标准明细`)">
+                <el-select style="width:43.5%" v-model="form.standardsmx" :placeholder="$t('请选择')" clearable >
+                  <el-option
+                      v-for="item in standardsmx"
+                      :key="item.index"
+                      :label="$t(item)"
+                      :value="item">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -376,6 +388,7 @@ export default {
         "pressure": "", //可选,压力
         "material": "", //可选,材质
         "standards": "", //可选,产品标准
+        "standardsmx":"",//产品标准明细
         "tradefields": '', //可选,领域
         "stockstatus2": '', //可选,库存缺货标准
         "stockstatus1": '', //可选,库存充足标准
@@ -432,6 +445,7 @@ export default {
       bindData:{},
       tradefield:[],// 领域
       standards:[],// 产品标准
+      standardsmx:[],//产品标准明细
       pressures:[],// 压力等级
       itemmaterial:[], // 材质
       butterflyplatedrive:[],// 蝶板驱动
@@ -522,6 +536,11 @@ export default {
       const res = await this.$store.dispatch('optiontypeselect','itemstandards')
       this.standards = res.data
     },
+    standardChange(val){
+      this.form.standards = val.value
+      this.form.standardsmx = ''
+      this.standardsmx = val.subvalues
+    },
 
     // 查询压力等级
     async pressureData () {

src/HDrpManagement/ProductMag/modules/edit.vue

@@ -102,12 +102,24 @@
             </el-col>
             <el-col :span="12">
               <el-form-item :label="$t(`产品标准`)">
-                <el-select style="width:100%" v-model="form.standards" :placeholder="$t('请选择')" clearable>
+                <el-select style="width:100%" v-model="form.standards" :placeholder="$t('请选择')" clearable @change="standardChange">
                   <el-option
                     v-for="item in standards"
                     :key="item.value"
                     :label="$t(item.value)"
-                    :value="item.value">
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :span="24">
+              <el-form-item :label="$t(`标准明细`)">
+                <el-select style="width:43.5%" v-model="form.standardsmx" :placeholder="$t('请选择')" clearable >
+                  <el-option
+                      v-for="item in standardsmx"
+                      :key="item.index"
+                      :label="$t(item)"
+                      :value="item">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -402,7 +414,8 @@ export default {
         "prodline": "",
         "device": "",
         "tags":"",
-        "categories":""
+        "categories":"",
+        "standardsmx":""
       },
       rules:{
          itemno: [
@@ -446,7 +459,8 @@ export default {
       tagList:[],
       siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
       categoriesList:[],
-      prodlines:[]
+      prodlines:[],
+      standardsmx:[]
     }
   },
   computed: {
@@ -498,7 +512,11 @@ export default {
       const res = await this.$store.dispatch('optiontypeselect','itemstandards')
       this.standards = res.data
     },
-
+    standardChange(val){
+      this.form.standards = val.value
+      this.form.standardsmx = ''
+      this.standardsmx = val.subvalues
+    },
     // 查询压力等级
     async pressureData () {
       const res = await this.$store.dispatch('optiontypeselect','pressurelevel')

src/HDrpManagement/orderManage/details/tabs/rebatesettlement.vue

@@ -3,9 +3,9 @@
     <el-tabs v-if="rebHeadData.length > 0" v-model="activeName" type="border-card" @tab-click="handleClick">
       <el-tab-pane v-for="item in rebHeadData" :key="item.index" :label="item.title" :name="item.title">
         <el-descriptions class="margin-top mt-10" title="居间明细" :column="2" size="small" border>
-          <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额比例">{{item.orderratio}}</el-descriptions-item>
+          <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额比例">{{item.calculatemodel == 1?Math.round((item.orderratio * 100)*100)/100 + '%':'--'}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="订单金额">{{item.amount?tool.formatAmount(item.amount,2):''}}</el-descriptions-item>
-          <el-descriptions-item :labelStyle="{width:'120px'}" label="居间产品折扣">{{Math.round((item.productdiscount * 100)*100)/100 + '%'}}</el-descriptions-item>
+          <el-descriptions-item :labelStyle="{width:'120px'}" label="居间产品折扣">{{item.calculatemodel == 2?Math.round((item.productdiscount * 100)*100)/100 + '%':'--'}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="居间费">{{tool.formatAmount(item.rebate,2)}}</el-descriptions-item>
           <el-descriptions-item :labelStyle="{width:'120px'}" label="结算经销商">{{item.enterprisename?item.enterprisename:'--'}}</el-descriptions-item>
         </el-descriptions>

src/HDrpManagement/productMoneyOdd/components/add.vue

@@ -4,7 +4,7 @@
     <el-drawer :title="$t(`新 增 商 品`)" append-to-body :visible.sync="dialogFormVisible" size="1000px">
       <div class="container">
         <div>
-          <selectClass @brandChange="brandChange" @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" :default="true"></selectClass>
+          <selectClass  @onClassChange="onClassChange" @Search="Search" @clearSearch="clearSearch" @clickField="clickField" @clickAreaBase="clickAreaBase" @brandChange="brandChange" :default="true"></selectClass>
           <el-input style="width:200px;margin-bottom:10px;margin-top:10px" size="small" :placeholder="$t(`请输入商品`)" @clear="getProductList(params.content.pageNumber=1)"
             @keyup.native.enter="getProductList(params.content.pageNumber=1)" v-model="params.content.where.condition" clearable />
         </div>
@@ -66,7 +66,8 @@ export default {
                 "condition": ""
             },
             "sa_itempriceadjustid":this.$route.query.id,
-            "itemclassid":57
+            "itemclassid":57,
+            "brandids":[]
         }
       },
       total:0,
@@ -87,10 +88,10 @@ export default {
     this.getProductList()
   },
   methods: {
-    brandChange(id) {
-      this.brandId = id
-      this.getProductList()
-    },
+    // brandChange(id) {
+    //   this.brandId = id
+    //   this.getProductList()
+    // },
     onClassChange (n) {
       this.params.content.where.itemclassid = n.itemclassid
       this.getProductList()
@@ -115,6 +116,14 @@ export default {
       this.params.content.tradefield = item.tradefield
       this.getProductList()
     },
+    clickAreaBase(item){
+      this.params.content.where.standards = item
+      this.getProductList()
+    },
+    brandChange(item){
+      this.params.content.brandids = item
+      this.getProductList()
+    },
     /* 提交 */
     async onSubmit () {
       let content = this.$refs.table.allArr.map(item => {

src/HDrpManagement/productMoneyOdd/components/selectClass/Select.vue

@@ -1,15 +1,43 @@
 <template>
   <div class="border-bottom">
     <div>
-      <ul class="flex-align-center normal-margin-new" >
-        <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField({})" >{{$t(`全部领域`)}}</li>
-        <li  :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{$t(item.tradefield)}}</li>
+      <ul class="normal-margin-new" ref="myUl">
+        <li
+            :class="areaBase === '' ? 'act' : ''"
+            class="brand-item border-all"
+            style="float: left"
+            v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
+            @click="clickAreaBase('')"
+        >
+          {{ $t("全部标准") }}
+        </li>
+        <li
+            :class="areaBase === item ? 'act' : ''"
+            v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
+            class="brand-item margin-notAll"
+            v-for="(item,index) in areaBases"
+            :key="item"
+            @click="clickAreaBase(item)"
+        >
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left" :class="areaBase === item ? 'act' : ''">{{ $t(item) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px" :class="areaBase === item ? 'act' : ''">{{ $t(item) }}</div>
+        </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
-        <li :class="!brand_act?'act':''" class="brand-item border-all" @click="clickBrand('')">{{$t(`全部品牌`)}}</li>
-        <li  :class="brand_act == item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{$t(item.brandname)}}</li>
+      <ul class="normal-margin-new" style="clear: both">
+        <li  :class="field_act === ''?'act':''"   style="float: left" class="brand-item border-all" @click="clickField('')"  v-if="(siteid == 'HY' && fields.length > 1) || siteid != 'HY'">{{$t(`全部领域`)}}</li>
+        <li  :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="(item,index) in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)"  v-if="(siteid == 'HY' && fields.length > 1) || siteid != 'HY'">
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left" :class="field_act === item.sys_enterprise_tradefieldid?'act':''">{{ $t(item.tradefield) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px" :class="field_act === item.sys_enterprise_tradefieldid?'act':''">{{ $t(item.tradefield) }}</div>
+        </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="normal-margin-new" style="clear: both">
+        <li :class="brand_act === ''?'act':''" style="float: left" class="brand-item border-all" @click="clickBrand('')"  v-if="(siteid == 'HY' && brands.length > 1) || siteid != 'HY'">{{$t(`全部品牌`)}}</li>
+        <li  :class="brand_act == item.sa_brandid?'act':''" class="brand-item margin-notAll" v-for="(item,index) in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)"  v-if="(siteid == 'HY' && brands.length > 1) || siteid != 'HY'">
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left" :class="brand_act == item.sa_brandid?'act':''">{{ $t(item.brandname) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px" :class="brand_act == item.sa_brandid?'act':''">{{ $t(item.brandname) }}</div>
+        </li>
+      </ul>
+      <ul class="flex-align-center normal-margin-new" style="clear: both">
         <li  :class="class_act === ''?'act':''" class="brand-item border-all" @click="clickClass('')">{{$t(`全部分类`)}}</li>
         <li  :class="class_act === item.itemclassnum?'act':''" class="brand-item margin-notAll" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{$t(item.itemclassname)}}</li>
       </ul>
@@ -30,7 +58,10 @@ export default {
       activeClass:{},
       field_act:'',
       brand_act:0,
-      class_act:''
+      class_act:'',
+      areaBases: [],
+      areaBase: "",
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
     }
   },
   provide () {
@@ -48,6 +79,18 @@ export default {
     classTree
   },
   methods:{
+    /* 授权标准 */
+    async queryAreaBase() {
+      const res1 = await this.$api.requested({
+        id: "20230519141202",
+        content: {
+          sys_enterpriseid: "", //不传查询当前账号授权的标准
+        },
+      });
+      this.areaBases = res1.data;
+      this.areaBase = "";
+      console.log("标准", this.areaBases);
+    },
     async queryAgentiInfo () {
       const res1 = await this.$api.requested({
         "id": 20221223141802,
@@ -73,8 +116,8 @@ export default {
         }
       })
       this.brands = res.data
-      this.brand_act = res.data[0].sa_brandid
-      this.clickBrand(res.data[0].sa_brandid)
+      this.brand_act = ""
+      // this.clickBrand(res.data[0].sa_brandid)
     },
 
     async queryClass () {
@@ -86,6 +129,7 @@ export default {
     },
     clickBrand (id) {
       this.brand_act = id ? id : 0
+      this.$emit("brandChange", this.brand_act ? [this.brand_act] : []);
       this.queryClass()
     },
     clickField (item) {
@@ -111,12 +155,17 @@ export default {
     },
     clearSearch() {
       this.$emit('clearSearch')
-    }
+    },
+    clickAreaBase(item) {
+      this.areaBase = item ? item : "";
+      this.$emit("clickAreaBase", item);
+    },
   },
   mounted () {
     this.queryClass()
     this.queryAgentiInfo()
     this.queryBrands()
+    this.queryAreaBase()
   }
 }
 

src/HManagement/siteManage/custom_option/index.vue

@@ -9,15 +9,15 @@
         <div class="flex-align-center flex-between mt-10">
           <add :disabled="disabled" :data="list" @addSuccess="onSuccess" style="margin-left: 2%"></add>
         </div>
-        <div >
-          <details_list ref="listDetails" :id="optiontypeid">
-            <template v-slot:edit="scope">
-              <edit v-if="tool.checkAuth($route.name,'update') && scope.data.siteid"  :data="scope.data" :classname="classname" @updateSuccess="onSuccess" :type="'text'" ></edit>
-            </template>
-            <template v-slot:del="scope">
-              <del_option v-if="tool.checkAuth($route.name,'delete') && scope.data.siteid"  :data="scope.data"   :type="'text'" @delSuccess="onSuccess" ></del_option>
-            </template>
-          </details_list>
+        <div>
+        <details_list ref="listDetails" :id="optiontypeid">
+          <template v-slot:edit="scope">
+            <edit v-if="tool.checkAuth($route.name,'update') && scope.data.siteid"  :data="scope.data" :classname="classname" @updateSuccess="onSuccess" :type="'text'" :issubvaluemag="list.issubvaluemag"></edit>
+          </template>
+          <template v-slot:del="scope">
+            <del_option v-if="tool.checkAuth($route.name,'delete') && scope.data.siteid"  :data="scope.data"   :type="'text'" @delSuccess="onSuccess" ></del_option>
+          </template>
+        </details_list>
         </div>
       </div>
     </div>

src/HManagement/siteManage/custom_option/modules/add.vue

@@ -14,6 +14,11 @@
                 <el-input type="textarea" autosize v-model="form.value" :placeholder="$t(`分类名称`)"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="20" v-if="data.issubvaluemag == '1'">
+              <el-form-item  :label="$t(`二级分类`)+':'" prop="subvalues">
+                <el-input type="textarea"  v-model="form.subvalues" :placeholder="$t(`二级分类名称`)" :rows="3"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item  :label="$t(`描述`)+':'" prop="remarks">
                 <el-input type="text" autosize v-model="form.remarks" :placeholder="$t(`描述`)"></el-input>
@@ -42,11 +47,15 @@ export default {
         "isused": "1",
         "value":"",
         "remarks":"",
-        "sequence":2
+        "sequence":2,
+        "subvalues":[]
       },
       rules:{
         value:[
-          { required: true, message: this.$t('请输入标签名'), trigger: 'blur'},
+          { required: true, message: this.$t('请输入分类名称'), trigger: 'blur'},
+        ],
+        subvalues:[
+          { required: true, message: this.$t('请输入二级分类名称'), trigger: 'blur'},
         ],
       }
     }
@@ -65,6 +74,9 @@ export default {
     async onSubmit  () {
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
+        if (typeof (this.form.subvalues) == 'string'){
+          this.form.subvalues = this.form.subvalues.split(',')
+        }
         this.form.optiontypeid = this.data.optiontypeid
         const res = await this.$api.requested({ "id": 20220901092601,content:this.form})
         this.tool.showMessage(res,()=>{

src/HManagement/siteManage/custom_option/modules/detailsList.vue

@@ -2,10 +2,18 @@
   <div class="container normal-panel">
     <tableLayout :layout="tablecols" :data="list" :opwidth="200" :custom="true" :height="tableHieght">
       <template v-slot:customcol="scope">
-        <p>{{$t(scope.column.data[scope.column.columnname])}}</p>
+        <div v-if="scope.column.columnname == 'subvalues'">
+          <div v-if="scope.column.data[scope.column.columnname] && scope.column.data[scope.column.columnname].length > 0">
+            <div v-for="item in scope.column.data[scope.column.columnname]" :key="item.index" style="float: left;margin-left: 5px;margin-bottom: 2px">
+              <el-tag  size="mini" effect="dark" >{{item}}</el-tag>
+            </div>
+          </div>
+        </div>
+        <p v-else>{{$t(scope.column.data[scope.column.columnname])}}</p>
       </template>
       <template v-slot:opreation="scope">
         <slot name="edit" :data="scope.data"></slot>
+        <slot name="add" :data="scope.data"></slot>
         <slot name="del" :data="scope.data"></slot>
       </template>
     </tableLayout>

src/HManagement/siteManage/custom_option/modules/edit.vue

@@ -14,6 +14,11 @@
                 <el-input type="textarea" autosize v-model="form.value" :placeholder="$t(`分类名称`)"></el-input>
               </el-form-item>
             </el-col>
+            <el-col :span="20" v-if="issubvaluemag == 1">
+              <el-form-item  :label="$t(`二级分类`)+':'" prop="subvalues">
+                <el-input type="textarea"  v-model="form.subvalues" :placeholder="$t(`二级分类名称`)" :rows="3"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="20">
               <el-form-item  :label="$t(`描述`)+':'" prop="remarks">
                 <el-input type="text" autosize v-model="form.remarks" :placeholder="$t(`描述`)"></el-input>
@@ -34,7 +39,7 @@
 <script>
 export default {
   name: "edit",
-  props:["data","classname"],
+  props:["data","classname","issubvaluemag"],
   data(){
     return {
       drawer:false,
@@ -44,11 +49,15 @@ export default {
         isused: "1",
         value:'',
         remarks:'',
-        sequence:2
+        sequence:2,
+        subvalues:[]
       },
       rules:{
         value:[
-          { required: true, message: this.$t('请输入标签名'), trigger: 'blur'},
+          { required: true, message: this.$t('请输入分类名称'), trigger: 'blur'},
+        ],
+        subvalues:[
+          { required: true, message: this.$t('请输入二级分类名称'), trigger: 'blur'},
         ],
       }
     }
@@ -60,11 +69,17 @@ export default {
       this.form.optiontypeid = this.data.optiontypeid
       this.form.value = this.data.value
       this.form.remarks = this.data.remarks
+      this.form.subvalues = this.data.subvalues
 
     },
     onSubmit(){
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
+        if (this.form.subvalues && typeof (this.form.subvalues) == 'string'){
+          this.form.subvalues = this.form.subvalues.split(',')
+        }else if (this.form.subvalues[0] == '') {
+          this.form.subvalues = []
+        }
         const res = await this.$api.requested({ "id": 20220901092601,content:this.form})
         this.tool.showMessage(res,()=>{
           this.drawer = false

src/SDrpManagement/ProductGroup/modules/Select2.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="border-bottom">
     <div>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="normal-margin-new" ref="myUl">
         <li
           :class="areaBase === '' ? 'act' : ''"
           class="brand-item border-all"
+          style="float: left"
           v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
           @click="clickAreaBase('')"
         >
@@ -14,18 +15,20 @@
           :class="areaBase === item ? 'act' : ''"
           v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
           class="brand-item margin-notAll"
-          v-for="item in areaBases"
+          v-for="(item,index) in areaBases"
           :key="item"
           @click="clickAreaBase(item)"
         >
-          {{ $t(item) }}
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left" :class="areaBase === item ? 'act' : ''">{{ $t(item) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px" :class="areaBase === item ? 'act' : ''">{{ $t(item) }}</div>
         </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="normal-margin-new" style="clear: both">
         <li
           :class="field_act === '' ? 'act' : ''"
           v-if="(siteid == 'HY' && fields.length > 1) || siteid != 'HY'"
           class="brand-item border-all"
+          style="float: left"
           @click="clickField('')"
         >
           {{ $t("全部领域") }}
@@ -34,17 +37,20 @@
           :class="tradefield === item.tradefield ? 'act' : ''"
           v-if="(siteid == 'HY' && fields.length > 1) || siteid != 'HY'"
           class="brand-item margin-notAll"
-          v-for="item in fields"
+          v-for="(item,index) in fields"
           :key="item.sys_enterprise_tradefieldid"
           @click="clickField(item)"
         >
-          {{ $t(item.tradefield) }}
+<!--          {{ $t(item.tradefield) }}-->
+          <div v-if="item.rowindex == 1"  class="brand-item margin-notAll" style="float: left"  :class="tradefield === item.tradefield ? 'act' : ''">{{ $t(item.tradefield) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px"  :class="tradefield === item.tradefield ? 'act' : ''">{{ $t(item.tradefield) }}</div>
         </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="normal-margin-new" style="clear: both">
         <li
           :class="!brand_act ? 'act' : ''"
           class="brand-item border-all"
+          style="float: left"
           v-if="(siteid == 'HY' && brands.length > 1) || siteid != 'HY'"
           @click="clickBrand('')"
         >
@@ -54,14 +60,16 @@
           :class="brand_act == item.sa_brandid ? 'act' : ''"
           v-if="(siteid == 'HY' && brands.length > 1) || siteid != 'HY'"
           class="brand-item margin-notAll"
-          v-for="item in brands"
+          v-for="(item,index) in brands"
           :key="item.sa_brandid"
           @click="clickBrand(item.sa_brandid)"
         >
-          {{ item.brandname }}
+<!--          {{ item.brandname }}-->
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left"  :class="brand_act == item.sa_brandid ? 'act' : ''">{{ $t(item.brandname) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px"  :class="brand_act == item.sa_brandid ? 'act' : ''">{{ $t(item.brandname) }}</div>
         </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="flex-align-center normal-margin-new" style="clear: both">
         <li
           :class="class_act === '' ? 'act' : ''"
           class="brand-item border-all"
@@ -105,7 +113,7 @@ export default {
       class_act: "",
       areaBases: [],
       areaBase: "",
-      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
     };
   },
   provide() {
@@ -239,6 +247,16 @@ export default {
       this.$emit("clearSearch");
     },
   },
+  // watch:{
+  //   "height":function (){
+  //     console.log(this.height,'444444高度222')
+  //     const newHeight = this.$refs.myUl.offsetHeight; // 获取当前高度。
+  //     if (newHeight !== this.height) { // 检查是否真的发生了变化（可选）以避免不必要的操作。
+  //       this.height = newHeight; // 更新高度值。可以在这里执行其他基于高度变化的逻辑。例如：console.log(newHeight); 或者 this.doSomethingWithNewHeight(newHeight);。
+  //     }
+  //     console.log(this.height,'高度')
+  //   }
+  // },
   mounted() {
     this.queryClass();
     this.queryAgentiInfo();

src/SDrpManagement/Products/index.vue

@@ -14,7 +14,7 @@
       </el-input>
 
     </div>
-    <select-class ref="class" @onClassChange="onClassChange" @clickField="clickField" :default="true" ></select-class>
+    <select-class ref="class" @onClassChange="onClassChange" @clickField="clickField" @clickAreaBase="clickAreaBase" @brandChange="brandChange" :default="true" ></select-class>
     <list ref="list" ></list>
   </div>
 </template>
@@ -49,6 +49,14 @@ export default {
       this.$refs['list'].params.content.tradefield = item?item.tradefield:''
       this.selectClick()
     },
+    clickAreaBase(item){
+      this.$refs['list'].params.content.where.standards = item?item:''
+      this.selectClick()
+    },
+    brandChange(item){
+      this.$refs['list'].params.content.brandids = item
+      this.selectClick()
+    }
   }
 }
 

src/SDrpManagement/Products/modules/Select.vue

@@ -1,47 +1,77 @@
 <template>
   <div class="border-bottom">
     <div>
-      <!-- <ul class="flex-align-center normal-margin-new" >
-        <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField(null)" >全部标准</li>
-        <li  :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in areaBases" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{$t(item.tradefield)}}</li>
-      </ul> -->
-      <ul class="flex-align-center normal-margin-new">
+<!--       <ul class="flex-align-center normal-margin-new" >-->
+<!--        <li  :class="field_act === ''?'act':''" class="brand-item border-all" @click="clickField(null)" >全部标准</li>-->
+<!--        <li  :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item margin-notAll" v-for="item in areaBases" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{$t(item.tradefield)}}</li>-->
+<!--      </ul> -->
+      <ul class="normal-margin-new" ref="myUl">
+        <li
+            :class="areaBase === '' ? 'act' : ''"
+            class="brand-item border-all"
+            style="float: left"
+            v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
+            @click="clickAreaBase('')"
+        >
+          {{ $t("全部标准") }}
+        </li>
+        <li
+            :class="areaBase === item ? 'act' : ''"
+            v-if="(siteid == 'HY' && areaBases.length > 1) || siteid != 'HY'"
+            class="brand-item margin-notAll"
+            v-for="(item,index) in areaBases"
+            :key="item"
+            @click="clickAreaBase(item)"
+        >
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left" :class="areaBase === item ? 'act' : ''">{{ $t(item) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px" :class="areaBase === item ? 'act' : ''">{{ $t(item) }}</div>
+        </li>
+      </ul>
+      <ul class="normal-margin-new" style="clear: both">
         <li
           :class="field_act === '' ? 'act' : ''"
           class="brand-item border-all"
+          v-if="(siteid == 'HY' && fields.length > 1) || siteid != 'HY'"
+          style="float: left"
           @click="clickField(null)"
         >
           {{$t('全部领域')}}
         </li>
         <li
           :class="field_act === item.sys_enterprise_tradefieldid ? 'act' : ''"
+          v-if="(siteid == 'HY' && fields.length > 1) || siteid != 'HY'"
           class="brand-item margin-notAll"
-          v-for="item in fields"
+          v-for="(item,index) in fields"
           :key="item.sys_enterprise_tradefieldid"
           @click="clickField(item)"
         >
-          {{ $t(item.tradefield) }}
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left" :class="field_act === item.sys_enterprise_tradefieldid ? 'act' : ''">{{ $t(item.tradefield) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px" :class="field_act === item.sys_enterprise_tradefieldid ? 'act' : ''">{{ $t(item.tradefield) }}</div>
         </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="normal-margin-new" style="clear: both">
         <li
           :class="!brand_act ? 'act' : ''"
           class="brand-item border-all"
+          style="float: left"
           @click="clickBrand(null)"
+          v-if="(siteid == 'HY' && brands.length > 1) || siteid != 'HY'"
         >
           {{$t('全部品牌')}}
         </li>
         <li
           :class="brand_act == item.sa_brandid ? 'act' : ''"
+          v-if="(siteid == 'HY' && brands.length > 1) || siteid != 'HY'"
           class="brand-item margin-notAll"
-          v-for="item in brands"
+          v-for="(item,index) in brands"
           :key="item.sa_brandid"
           @click="clickBrand(item.sa_brandid)"
         >
-          {{ item.brandname }}
+          <div v-if="index == 0"  class="brand-item margin-notAll" style="float: left" :class="brand_act == item.sa_brandid ? 'act' : ''">{{ $t(item.brandname) }}</div>
+          <div v-else class="brand-item margin-notAll" style="float: left;margin-left: 15px" :class="brand_act == item.sa_brandid ? 'act' : ''">{{ $t(item.brandname) }}</div>
         </li>
       </ul>
-      <ul class="flex-align-center normal-margin-new">
+      <ul class="flex-align-center normal-margin-new" style="clear: both">
         <li
           :class="class_act === '' ? 'act' : ''"
           class="brand-item border-all"
@@ -82,8 +112,9 @@ export default {
       field_act: "",
       brand_act: "",
       class_act: "",
-      areaBasesL: [],
+      areaBases: [],
       areaBase: "",
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid,
     };
   },
   props: {
@@ -144,8 +175,13 @@ export default {
       });
       this.itemclass = res.data[0].ttemclass;
     },
+    clickAreaBase(item) {
+      this.areaBase = item ? item : "";
+      this.$emit("clickAreaBase", item);
+    },
     clickBrand(id) {
-      this.brand_act = id ? id : "";
+      this.brand_act = id ? id : 0;
+      this.$emit("brandChange", this.brand_act ? [this.brand_act] : []);
       this.queryClass();
     },
     clickField(item) {
@@ -210,4 +246,4 @@ export default {
 .margin-notAll {
   margin-left: -18px;
 }
-</style>
+</style>

src/SDrpManagement/salerOrder/modules/add.vue

@@ -179,7 +179,7 @@
               :span="12"
               v-if="form.type !== '工具订单' && form.type !== '项目订单'"
             >
-              <el-form-item :label="$t(`领域明细`)">
+              <el-form-item :label="$t(`领域明细`)" prop="tradefieldmx">
                 <el-select
                   v-model="form.tradefieldmx"
                   :placeholder="$t(`请选择领域明细`)"
@@ -217,7 +217,7 @@
                 form.type === '样品订单'
               "
             >
-              <el-form-item :label="$t(`项目备注`)">
+              <el-form-item :label="$t(`项目备注`)" prop="projectnote">
                 <el-input
                   size="mini"
                   class="order__note__input"
@@ -395,7 +395,10 @@ export default {
       this.typemxlist = res.data;
     },
     resetForm() {
-      this.$refs["form"].resetFields();
+      // this.$refs["form"].resetFields();
+      let type = this.form.type
+      this.$refs.form.resetFields()
+      this.form.type = type
       if (this.$refs.enterprise) this.$refs.enterprise.form.enterprisename = "";
     },
     async pageData() {
@@ -431,6 +434,7 @@ export default {
       this.form.sa_contractid = row.sa_contractid;
       this.form.sa_projectid = row.sa_projectid;
       this.form.contractname = row.title === "" ? this.$t("未知") : row.title;
+      this.$refs.form.validateField("contractname")
       this.visible = false;
     },
     setChildField(item) {
@@ -474,6 +478,7 @@ export default {
         rebate_used: 0, //默认0，是否使用返利金
         billdate: "", //单据日期，默认创建日期
         signbacknum: "",
+        contractname:""
       };
       this.visible1 = false;
     },

src/SManagement/orderclue/index.vue

@@ -84,6 +84,14 @@
           </div>
           <div v-else>--</div>
         </div>
+        <div v-else-if="scope.data.column.columnname == 'city'">
+          <span v-if="scope.data.column.data.province.length > 0"
+          >{{ scope.data.column.data.province }}-{{
+              scope.data.column.data.city
+            }}-{{ scope.data.column.data.county }}</span
+          >
+          <span v-else>--</span>
+        </div>
         <div v-else-if="scope.data.column.columnname == 'scale'">
           <span>{{scope.data.column.data[[scope.data.column.columnname]] !== '' &&  scope.data.column.data[[scope.data.column.columnname]] !== 0?scope.data.column.data[[scope.data.column.columnname]]+$t(scope.data.column.data.unitname):'--'}}</span>
         </div>