Merge branch 'mergeBranch' into orangeUrgent

src/HDrpManagement/dispatch/details/index.vue

@@ -22,9 +22,9 @@
         <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>-->
-        <dialogTemplate ref="submitRef" v-if="tool.checkAuth($route.name,'submit') && mainData.status == '新建' && usertype != 0" class="inline-16" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" :mainAData="mainAreaData" content="是否确定提交发货单" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess" @submitSuccess="submitSuccess"></dialogTemplate>
+        <dialogTemplate ref="submitRef" v-if="tool.checkAuth($route.name,'submit') && mainData.status == '新建'" class="inline-16" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" :mainAData="mainAreaData" content="是否确定提交发货单" paramId="2024120915192102" idName="sa_dispatchid" @onSuccess="onSuccess" @submitSuccess="submitSuccess"></dialogTemplate>
         <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>
-        <dialogTemplate ref="submitRefShow" v-if="tool.checkAuth($route.name,'verificationCheck') && (mainData.status == '新建')"  class="inline-16" btnTitle="提交" :disabled="mainData.status !== '新建'" btnType="primary" :mainAData="mainAreaData" content="是否确定提交发货单" paramId="2024120915192102" idName="sa_dispatchid" :isParamId="false" @onSuccess="onSuccess" @submitSuccess="submitSuccess"></dialogTemplate>
+        <dialogTemplate ref="submitRefShow" v-if="tool.checkAuth($route.name,'verificationCheck') && (mainData.status == '新建')"  class="inline-16" btnTitle="校验提交" :disabled="mainData.status !== '新建'" btnType="primary" :mainAData="mainAreaData" content="是否确定提交发货单" paramId="2024120915192102" idName="sa_dispatchid" :isParamId="false" @onSuccess="onSuccess" @submitSuccess="submitSuccess"></dialogTemplate>
         <el-button style="margin-left: 0px" type="primary"  class="inline-16" size="mini"  v-if="tool.checkAuth($route.name,'check') && mainData.status !== '审核' && mainData.status !== '复核' && mainData.status !== '关闭'"  @click="onCheck">{{mainData.status === '审核'?$t('反审核'):mainData.status === '复核'?$t('反审核'):$t('审核')}}</el-button>
         <dialogTemplateNew ref="dialogTemplateNew" class="inline-16" v-if="tool.checkAuth($route.name,'check') && mainData.status == '审核'" btnTitle="反审核" btnType="primary" content="确定反审核该发货单" @onCancel="form.uncheckreason = ''" @onSubmit="onSubmit">
           <template slot="formRule">

src/HManagement/addressList/mycontact/modules/addContact.vue

@@ -236,6 +236,7 @@ export default {
   },
   methods:{
     onShow () {
+      this.form.sys_enterpriseids = []
       this.dialogFormVisible = true
       this.queryGroup()
       console.log(this.tagList,'tagList')
@@ -264,26 +265,6 @@ export default {
           this.$store.commit('setLoading',false)
           this.dialogFormVisible = false
           this.$refs.form.resetFields()
-          this.form = {
-            "sys_phonebookid":0,     //sys_phonebookid<=0时 为新增
-            "sys_phonebookgroupid":"",
-            "name": "",
-            "phonenumber": "",
-            "company": "",
-            "depname": "",
-            "position": "",
-            "email": "",
-            "sex": "男",
-            "birthday": '',
-            "homeaddress": "",
-            "remarks": "",
-            "tag": [],
-            "isTelephone":'0',
-            "fax":"",
-            "areaCode":'',
-            "telephone":'',
-            "groupname":"",
-          }
           this.$emit('onAddSuccess')
         })
       });
@@ -291,25 +272,6 @@ export default {
     onClose(){
       this.dialogFormVisible = false
       this.$refs.form.resetFields()
-      this.form = {
-        "sys_phonebookid":0,     //sys_phonebookid<=0时 为新增
-        "sys_phonebookgroupid":"",
-        "name": "",
-        "phonenumber": "",
-        "company": "",
-        "depname": "",
-        "position": "",
-        "email": "",
-        "sex": "男",
-        "birthday": '',
-        "homeaddress": "",
-        "remarks": "",
-        "tag": [],
-        "isTelephone":'0',
-        "fax":"",
-        "areaCode":'',
-        "telephone":''
-      }
     },
     hasDisabledTag (item) {
       let arr = []

src/optionSystem/throttleManage/detail/modules/attrite/index.vue

@@ -1,26 +1,16 @@
 <template>
   <div class="attrite">
-    <ImportFile
-      ref="importFile"
-      class="inline-16"
-      :bindData="{
-        ownertable: 'plm_item',
-        ownerid: $route.query.id,
-        usetype: 'default',
-      }"
-      :errorUrl="errorUrl"
-      @clearUrl="errorUrl = null"
-      @onSuccess="bindImportOrder"
-      v-if="tool.checkAuth($route.name, 'import')"
-    />
+    <ImportFile ref="importFile" class="inline-16" :bindData="{
+      ownertable: 'plm_item',
+      ownerid: $route.query.id,
+      usetype: 'default',
+    }" :errorUrl="errorUrl" @clearUrl="errorUrl = null" @onSuccess="bindImportOrder"
+      v-if="tool.checkAuth($route.name, 'import')" />
     <div class="line-box">
       <div class="item" v-show="source.dc.length">
         <div class="title">
           {{ $t("Dc值") }}
-          <div
-            v-if="tool.checkAuth($route.name, 'excel')"
-            style="cursor: pointer; margin-left: 20px; margin-top: -3px"
-          >
+          <div v-if="tool.checkAuth($route.name, 'excel')" style="cursor: pointer; margin-left: 20px; margin-top: -3px">
             <el-button type="text" size="small" @click="excel('dc')">{{
               $t("导出")
             }}</el-button>
@@ -31,10 +21,7 @@
       <div class="item" v-show="source.fl.length">
         <div class="title">
           {{ $t("Fl值") }}
-          <div
-            v-if="tool.checkAuth($route.name, 'excel')"
-            style="cursor: pointer; margin-left: 20px; margin-top: -3px"
-          >
+          <div v-if="tool.checkAuth($route.name, 'excel')" style="cursor: pointer; margin-left: 20px; margin-top: -3px">
             <el-button type="text" size="small" @click="excel('fl')">{{
               $t("导出")
             }}</el-button>
@@ -45,10 +32,7 @@
       <div class="item" v-show="source.kv.length">
         <div class="title">
           {{ $t("Kv值") }}
-          <div
-            v-if="tool.checkAuth($route.name, 'excel')"
-            style="cursor: pointer; margin-left: 20px; margin-top: -3px"
-          >
+          <div v-if="tool.checkAuth($route.name, 'excel')" style="cursor: pointer; margin-left: 20px; margin-top: -3px">
             <el-button type="text" size="small" @click="excel('kv')">{{
               $t("导出")
             }}</el-button>
@@ -59,10 +43,7 @@
       <div class="item" v-show="source.xt.length">
         <div class="title">
           {{ $t("Xt值") }}
-          <div
-            v-if="tool.checkAuth($route.name, 'excel')"
-            style="cursor: pointer; margin-left: 20px; margin-top: -3px"
-          >
+          <div v-if="tool.checkAuth($route.name, 'excel')" style="cursor: pointer; margin-left: 20px; margin-top: -3px">
             <el-button type="text" size="small" @click="excel('xt')">{{
               $t("导出")
             }}</el-button>
@@ -73,10 +54,8 @@
       <div class="item" v-show="source.zeta.length">
         <div class="title">
           {{ $t("Zeta值") }}
-          <div
-            v-if="tool.checkAuth($route.name, 'import')"
-            style="cursor: pointer; margin-left: 20px; margin-top: -3px"
-          >
+          <div v-if="tool.checkAuth($route.name, 'import')"
+            style="cursor: pointer; margin-left: 20px; margin-top: -3px">
             <el-button type="text" size="small" @click="excel('zeta')">{{
               $t("导出")
             }}</el-button>
@@ -132,38 +111,42 @@ export default {
     },
     init() {
       let that = this;
-      console.log("this.source", this.source);
       Object.keys(this.items).forEach((v) => _render(v));
+
       function _render(el) {
-        const data = that.source[el];
-        let range = [0, 1];
-        const isDescending = data.every((item, index, arr) => {
-          return index === 0 || item.value <= arr[index - 1].value;
+        const data = that.source[el].map(v => {
+          v.value = v.value - 0
+          return v
         });
-        if (isDescending) {
-          range = [1, 0];
-        } else {
-        }
+        console.log("data", JSON.stringify(data));
+
         that.items[el] = new Line(that.$refs[el], {
-          data: that.source[el],
+          data: data,
           padding: "auto",
           xField: "li",
           yField: "value",
           seriesField: "name",
+          point: {
+            size: 2,
+            style: {
+              fill: 'white',
+              stroke: '#5B8FF9',
+              lineWidth: 2,
+            },
+          },
+          label: {
+            // 在折线的每个点显示数值
+            position: 'top',
+            formatter: (datum) => datum.value // 保留3位小数，可按需调整
+          },
           yAxis: {
-            tickCount: 8,
-            range,
           },
           legend: {
             visible: false,
           },
-          tooltip: {
-            formatter: (datum) => {
-              return { name: datum.name, value: datum.value };
-            },
-          },
-          smooth: true,
+          smooth: false, // 关闭平滑曲线，显示折线
         });
+
         that.items[el].render();
       }
     },
@@ -205,6 +188,7 @@ export default {
   margin-top: 20px;
   position: relative;
 }
+
 .attrite .title {
   font-size: 16px;
   font-weight: bolder;