فهرست منبع

收入凭证、支出凭证,订单管理、发货单、物流单、订货业务样式调整bug修复

qymljy 1 ماه پیش
والد
کامیت
dc0eefe3a3

+ 14 - 1
src/Form/payvoucher/add.vue

@@ -94,6 +94,19 @@ export default {
   name: "add",
   components:{enterprise},
   data(){
+    // 自定义校验函数
+    const validateAmount = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error(this.$t('支出金额不可为空')));
+      }
+      // 正则:允许整数或最多两位小数
+      const reg = /^\d+(\.\d{1,2})?$/;
+      if (!reg.test(value)) {
+        callback(new Error(this.$t('请输入有效的数字,最多两位小数')));
+      } else {
+        callback();
+      }
+    };
     return {
       dialogFormVisible:false,
       visibleEnterprise:false,
@@ -120,7 +133,7 @@ export default {
           { required: true, message: this.$t('请选择账户类型'), trigger: 'change'},
         ],
         amount:[
-          { required: true, message: this.$t('支出金额不可为空'), trigger: 'blur'},
+          { required: true, validator: validateAmount,  trigger: 'blur'},
         ],
       },
       enterprises:[],

+ 14 - 1
src/Form/payvoucher/edit.vue

@@ -94,6 +94,19 @@ export default {
   props:["data","btnType"],
   components:{enterprise},
   data(){
+    // 自定义校验函数
+    const validateAmount = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error(this.$t('支出金额不可为空')));
+      }
+      // 正则:允许整数或最多两位小数
+      const reg = /^\d+(\.\d{1,2})?$/;
+      if (!reg.test(value)) {
+        callback(new Error(this.$t('请输入有效的数字,最多两位小数')));
+      } else {
+        callback();
+      }
+    };
     return {
       dialogFormVisible:false,
       visibleEnterprise:false,
@@ -111,7 +124,7 @@ export default {
           { required: true, message: this.$t('请选择账户类型'), trigger: 'change'},
         ],
         amount:[
-          { required: true, message: this.$t('支出金额不可为空'), trigger: 'blur'},
+          { required: true, validator: validateAmount,  trigger: 'blur'},
         ],
       },
       classData:[],

+ 14 - 1
src/Form/recvoucher/add.vue

@@ -94,6 +94,19 @@ export default {
   name: "add",
   components:{enterprise},
   data(){
+    // 自定义校验函数
+    const validateAmount = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error(this.$t('请输入金额')));
+      }
+      // 正则:允许整数或最多两位小数
+      const reg = /^\d+(\.\d{1,2})?$/;
+      if (!reg.test(value)) {
+        callback(new Error(this.$t('请输入有效的数字,最多两位小数')));
+      } else {
+        callback();
+      }
+    };
     return {
       dialogFormVisible:false,
       visibleEnterprise:false,
@@ -120,7 +133,7 @@ export default {
           { required: true, message: this.$t('请选择账户类型'), trigger: 'change'},
         ],
         amount:[
-          { required: true, message: this.$t('请输入金额'), trigger: 'blur'},
+          { required: true, validator: validateAmount, trigger: 'blur'},
         ],
       },
       enterprises:[],

+ 14 - 1
src/Form/recvoucher/edit.vue

@@ -94,6 +94,19 @@ export default {
   props:["data","btnType"],
   components:{enterprise},
   data(){
+    // 自定义校验函数
+    const validateAmount = (rule, value, callback) => {
+      if (!value) {
+        return callback(new Error(this.$t('请输入金额')));
+      }
+      // 正则:允许整数或最多两位小数
+      const reg = /^\d+(\.\d{1,2})?$/;
+      if (!reg.test(value)) {
+        callback(new Error(this.$t('请输入有效的数字,最多两位小数')));
+      } else {
+        callback();
+      }
+    };
     return {
       dialogFormVisible:false,
       visibleEnterprise:false,
@@ -111,7 +124,7 @@ export default {
           { required: true, message: this.$t('请选择账户类型'), trigger: 'change'},
         ],
         amount:[
-          { required: true, message: this.$t('请输入金额'), trigger: 'blur'},
+          { required: true,  validator: validateAmount,trigger: 'blur'},
         ],
       },
       classData:[],

+ 2 - 2
src/HDrpManagement/ProductMag/detail/index.vue

@@ -180,11 +180,11 @@ export default {
           value:this.mainData.orderaddqty
         },
         {
-          label:'品号',
+          label:'erp品号',
           value:this.mainData.erpitemno
         },
         {
-          label:'品名',
+          label:'erp品名',
           value:this.mainData.erpitemname
         },
         {

+ 4 - 4
src/HDrpManagement/ProductMag/detail/modules/detailedData.vue

@@ -3,11 +3,11 @@
     <div class="normal-margin">
       <el-descriptions :column="3" :labelStyle="{width:'120px',flex:'1 0 auto',}" :contentStyle="{width:'250px',flex:'1 0 auto'}" border>
         <div slot="title" class="my-label__title">{{$t('基本信息')}}</div>
-        <el-descriptions-item  :label="$t(`商品编码`)">{{ basic.itemno || '--'}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`品名称`)">{{ basic.itemname || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`产品编号`)">{{ basic.itemno || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`品名称`)">{{ basic.itemname || '--'}}</el-descriptions-item>
         <el-descriptions-item  :label="$t('状态')"><span :style="tool.getStatusColor(basic.status)">{{ $t(basic.status)}}</span></el-descriptions-item>
-        <el-descriptions-item :label="$t('品号')">{{ basic.erpitemno || '--'}}</el-descriptions-item>
-        <el-descriptions-item  :label="$t(`品名`)">{{ basic.erpitemname || '--'}}</el-descriptions-item>
+        <el-descriptions-item :label="$t('erp品号')">{{ basic.erpitemno || '--'}}</el-descriptions-item>
+        <el-descriptions-item  :label="$t(`erp品名`)">{{ basic.erpitemname || '--'}}</el-descriptions-item>
 <!--        <el-descriptions-item  :label="$t(`外形尺寸`)">长:{{ basic.length}};宽:{{basic.width}};高:{{basic.height}}</el-descriptions-item>-->
         <el-descriptions-item  :label="$t(`上/下架`)"><span :style="{color:basic.isonsale ? tool.getStatusColor('上架',true) : tool.getStatusColor('下架',true)}">{{ basic.isonsale ? $t('上架') : $t('下架')}}</span></el-descriptions-item>
         <el-descriptions-item  :label="$t('型号')">{{ basic.model || '--'}}</el-descriptions-item>

+ 4 - 4
src/HDrpManagement/ProductMag/modules/add.vue

@@ -6,13 +6,13 @@
         <el-row :gutter="10">
           <el-form label-position="right" :label-width="tool.onlyZh('90px')" :model="form" :rules="rules" ref="form" size="small">
             <el-col :span="12">
-              <el-form-item :label="$t('品号')" prop="itemno">
-                <el-input :disabled="calcDisabled" v-model="form.itemno" :placeholder="$t(`输入品号`)" @change="itemnoChange" @blur="searchFproduct"></el-input>
+              <el-form-item :label="$t('号')" prop="itemno">
+                <el-input :disabled="calcDisabled" v-model="form.itemno" :placeholder="$t(`输入号`)" @change="itemnoChange" @blur="searchFproduct"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`品名`)" prop="itemname">
-                <el-input :disabled="calcDisabled" v-model="form.itemname"  :placeholder="$t(`输入品名`)"></el-input>
+              <el-form-item :label="$t(`品名`)" prop="itemname">
+                <el-input :disabled="calcDisabled" v-model="form.itemname"  :placeholder="$t(`输入品名`)"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">

+ 2 - 2
src/HDrpManagement/ProductMag/modules/edit.vue

@@ -6,12 +6,12 @@
         <el-row :gutter="10">
           <el-form label-position="right" :label-width="tool.onlyZh('90px')" :model="form" :rules="rules" ref="form" size="small">
             <el-col :span="12">
-              <el-form-item :label="$t('品号')" prop="itemno">
+              <el-form-item :label="$t('号')" prop="itemno">
                 <el-input :disabled="calcDisabled" v-model="form.itemno" :placeholder="$t(`输入产品编号`)" @change="itemnoChange"></el-input>
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item :label="$t(`品名`)" prop="itemname">
+              <el-form-item :label="$t(`品名`)" prop="itemname">
                 <el-input :disabled="calcDisabled" v-model="form.itemname"  :placeholder="$t(`输入产品名称`)"></el-input>
               </el-form-item>
             </el-col>

+ 148 - 74
src/HDrpManagement/dispatch/details/index.vue

@@ -138,80 +138,154 @@ import printMaterials from "../modules/printMaterials";
 
       changeDataStructure() {
         let that = this
-        this.mainAreaData = [
-          {
-            label:'发货单号',
-            value:this.mainData.billno
-          },
-          {
-            label:'订单号',
-            value:this.mainData.sonum
-          },
-          {
-            label:'erp单号',
-            value:this.mainData.erpbillno
-          },
-          {
-            label:'发货日期',
-            value:this.mainData.billdate?this.mainData.billdate:'--'
-          },
-          {
-            label:'企业编号',
-            value:this.mainData.agentnum
-          },
-          {
-            label:'企业名称',
-            value:this.mainData.enterprisename
-          },
-          {
-            label:'项目名称',
-            value:this.mainData.projectname
-          },
-          {
-            label:'状态',
-            value:this.$t(this.mainData.status),
-            style:function () {
-              let style = that.tool.getStatusColor(that.mainData.status)
-              return style
-            }
-          },
-          {
-            label:'发货数量',
-            value:this.mainData.qty?this.mainData.qty:'--'
-          },
-          {
-            label:'发货金额',
-            value:this.mainData.sumamount ? this.tool.formatAmount(this.mainData.sumamount,2) : '--',
-          },
-          {
-            label:'运费方式',
-            value:this.$t(this.mainData.freightstatus)
-          },
-          {
-            label:'订单类型',
-            value:this.mainData.type
-          },
-          {
-          label:'回签单',
-            value:this.mainData.signbackstatus
-          },
-          {
-            label:'出货状态',
-            value:this.$t(this.mainData.shipmentstatus),
-            style:function () {
-              let style = that.tool.getStatusColor(that.mainData.shipmentstatus)
-              return style
-            }
-          },
-          {
-            label:'对外备注',
-            value:this.mainData.remarks
-          },
-          {
-            label:'对内备注',
-            value:this.mainData.remarks_in
-          },
-        ]
+        if (this.tool.checkAuth(this.$route.name,'internalNote')){
+          this.mainAreaData = [
+            {
+              label:'发货单号',
+              value:this.mainData.billno
+            },
+            {
+              label:'订单号',
+              value:this.mainData.sonum
+            },
+            {
+              label:'erp单号',
+              value:this.mainData.erpbillno
+            },
+            {
+              label:'发货日期',
+              value:this.mainData.billdate?this.mainData.billdate:'--'
+            },
+            {
+              label:'企业编号',
+              value:this.mainData.agentnum
+            },
+            {
+              label:'企业名称',
+              value:this.mainData.enterprisename
+            },
+            {
+              label:'项目名称',
+              value:this.mainData.projectname
+            },
+            {
+              label:'状态',
+              value:this.$t(this.mainData.status),
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.status)
+                return style
+              }
+            },
+            {
+              label:'发货数量',
+              value:this.mainData.qty?this.mainData.qty:'--'
+            },
+            {
+              label:'发货金额',
+              value:this.mainData.sumamount ? this.tool.formatAmount(this.mainData.sumamount,2) : '--',
+            },
+            {
+              label:'运费方式',
+              value:this.$t(this.mainData.freightstatus)
+            },
+            {
+              label:'订单类型',
+              value:this.mainData.type
+            },
+            {
+              label:'回签单',
+              value:this.mainData.signbackstatus
+            },
+            {
+              label:'出货状态',
+              value:this.$t(this.mainData.shipmentstatus),
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.shipmentstatus)
+                return style
+              }
+            },
+            {
+              label:'对外备注',
+              value:this.mainData.remarks
+            },
+            {
+              label:'对内备注',
+              value:this.mainData.remarks_in
+            },
+          ]
+        }else {
+          this.mainAreaData = [
+            {
+              label:'发货单号',
+              value:this.mainData.billno
+            },
+            {
+              label:'订单号',
+              value:this.mainData.sonum
+            },
+            {
+              label:'erp单号',
+              value:this.mainData.erpbillno
+            },
+            {
+              label:'发货日期',
+              value:this.mainData.billdate?this.mainData.billdate:'--'
+            },
+            {
+              label:'企业编号',
+              value:this.mainData.agentnum
+            },
+            {
+              label:'企业名称',
+              value:this.mainData.enterprisename
+            },
+            {
+              label:'项目名称',
+              value:this.mainData.projectname
+            },
+            {
+              label:'状态',
+              value:this.$t(this.mainData.status),
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.status)
+                return style
+              }
+            },
+            {
+              label:'发货数量',
+              value:this.mainData.qty?this.mainData.qty:'--'
+            },
+            {
+              label:'发货金额',
+              value:this.mainData.sumamount ? this.tool.formatAmount(this.mainData.sumamount,2) : '--',
+            },
+            {
+              label:'运费方式',
+              value:this.$t(this.mainData.freightstatus)
+            },
+            {
+              label:'订单类型',
+              value:this.mainData.type
+            },
+            {
+              label:'回签单',
+              value:this.mainData.signbackstatus
+            },
+            {
+              label:'出货状态',
+              value:this.$t(this.mainData.shipmentstatus),
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.shipmentstatus)
+                return style
+              }
+            },
+            {
+              label:'对外备注',
+              value:this.mainData.remarks
+            },
+          ]
+        }
+
       },
       // 监听切换数据,上一页,下一页
       pageChange (id,rowindex,tabIndex) {

+ 2 - 2
src/HDrpManagement/dispatch/modules/edit.vue

@@ -113,10 +113,10 @@
         <p class="normal-title inline-16">{{$t(`对外备注`)}}</p>
       </div>
       <el-input style="margin-bottom:20px" v-model="defaultData.remarks"  :placeholder="$t(`请输入对外备注`)"></el-input>
-      <div class="mt-10">
+      <div class="mt-10" v-if="tool.checkAuth($route.name,'internalNote')">
         <p class="normal-title inline-16">{{$t(`对内备注`)}}</p>
       </div>
-      <el-input style="margin-bottom:20px" v-model="defaultData.remarks_in"  :placeholder="$t(`请输入对内备注`)"></el-input>
+      <el-input style="margin-bottom:20px" v-model="defaultData.remarks_in" v-if="tool.checkAuth($route.name,'internalNote')"  :placeholder="$t(`请输入对内备注`)"></el-input>
       <div class="mt-10">
         <div>
           <p class="normal-title inline-16">{{$t(`发货单产品`)}}</p>

+ 165 - 82
src/HDrpManagement/logistics/details/index.vue

@@ -92,89 +92,172 @@
       },
       changeDataStructure() {
         let that = this
-        this.mainAreaData = [
-          {
-            label:'物流编号',
-            value:this.mainData.billno
-          },
-          {
-            label:'erp单号',
-            value:this.mainData.erpbillno
-          },
-          {
-            label:'单据日期',
-            value:this.mainData.billdate
-          },
-          {
-            label:'车牌号',
-            value:this.mainData.carnum
-          },
-          {
-            label:'物流联系人',
-            value:this.mainData.logiscontact
-          },
-          {
-            label:'物流电话',
-            value:this.mainData.logisphone
-          },
-          {
-            label:'项目名称',
-            value:this.mainData.projectName
-          },
-          {
-            label:'快递公司',
-            value:this.mainData.logiscompname
-          },
-          {
-            label:'快递单号',
-            value:this.mainData.logisticno
-          },
-          {
-            label:'运费',
-            value:this.mainData.freightamount
-          },
-          {
-            label:'收货人',
-            value:this.mainData.name
-          },
-          {
-            label:'运费方式',
-            value:this.mainData.paytype
-          },
+        if (this.tool.checkAuth(this.$route.name,'internalNote')){
+          this.mainAreaData = [
+            {
+              label:'物流编号',
+              value:this.mainData.billno
+            },
+            {
+              label:'erp单号',
+              value:this.mainData.erpbillno
+            },
+            {
+              label:'单据日期',
+              value:this.mainData.billdate
+            },
+            {
+              label:'车牌号',
+              value:this.mainData.carnum
+            },
+            {
+              label:'物流联系人',
+              value:this.mainData.logiscontact
+            },
+            {
+              label:'物流电话',
+              value:this.mainData.logisphone
+            },
+            {
+              label:'项目名称',
+              value:this.mainData.projectName
+            },
+            {
+              label:'快递公司',
+              value:this.mainData.logiscompname
+            },
+            {
+              label:'快递单号',
+              value:this.mainData.logisticno
+            },
+            {
+              label:'运费',
+              value:this.mainData.freightamount
+            },
+            {
+              label:'收货人',
+              value:this.mainData.name
+            },
+            {
+              label:'运费方式',
+              value:this.mainData.paytype
+            },
+
+            {
+              label:'状态',
+              value:this.$t(this.mainData.status),
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.status)
+                return style
+              }
+            },
+            {
+              label:'企业编码',
+              value:this.mainData.agentnum
+            },
+            {
+              label:'企业名称',
+              value:this.mainData.enterprisename
+            },
+            {
+              label:'订单类型',
+              value:this.mainData.type
+            },
+            {
+              label:'回签单',
+              value:this.mainData.signbackstatus
+            },
+            {
+              label:'对外备注',
+              value:this.mainData.remarks
+            },
+            {
+              label:'对内备注',
+              value:this.mainData.remarks_in
+            },
+          ]
+        }else {
+          this.mainAreaData = [
+            {
+              label:'物流编号',
+              value:this.mainData.billno
+            },
+            {
+              label:'erp单号',
+              value:this.mainData.erpbillno
+            },
+            {
+              label:'单据日期',
+              value:this.mainData.billdate
+            },
+            {
+              label:'车牌号',
+              value:this.mainData.carnum
+            },
+            {
+              label:'物流联系人',
+              value:this.mainData.logiscontact
+            },
+            {
+              label:'物流电话',
+              value:this.mainData.logisphone
+            },
+            {
+              label:'项目名称',
+              value:this.mainData.projectName
+            },
+            {
+              label:'快递公司',
+              value:this.mainData.logiscompname
+            },
+            {
+              label:'快递单号',
+              value:this.mainData.logisticno
+            },
+            {
+              label:'运费',
+              value:this.mainData.freightamount
+            },
+            {
+              label:'收货人',
+              value:this.mainData.name
+            },
+            {
+              label:'运费方式',
+              value:this.mainData.paytype
+            },
+
+            {
+              label:'状态',
+              value:this.$t(this.mainData.status),
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.status)
+                return style
+              }
+            },
+            {
+              label:'企业编码',
+              value:this.mainData.agentnum
+            },
+            {
+              label:'企业名称',
+              value:this.mainData.enterprisename
+            },
+            {
+              label:'订单类型',
+              value:this.mainData.type
+            },
+            {
+              label:'回签单',
+              value:this.mainData.signbackstatus
+            },
+            {
+              label:'对外备注',
+              value:this.mainData.remarks
+            },
+          ]
+        }
 
-          {
-            label:'状态',
-            value:this.$t(this.mainData.status),
-            style:function () {
-              let style = that.tool.getStatusColor(that.mainData.status)
-              return style
-            }
-          },
-          {
-            label:'企业编码',
-            value:this.mainData.agentnum
-          },
-          {
-            label:'企业名称',
-            value:this.mainData.enterprisename
-          },
-          {
-            label:'订单类型',
-            value:this.mainData.type
-          },
-          {
-          label:'回签单',
-            value:this.mainData.signbackstatus
-          },
-          {
-            label:'对外备注',
-            value:this.mainData.remarks
-          },
-          {
-            label:'对内备注',
-            value:this.mainData.remarks_in
-          },
-        ]
       },
       // 监听切换数据,上一页,下一页
       pageChange (id,rowindex,tabIndex) {

+ 1 - 1
src/HDrpManagement/logistics/modules/edit.vue

@@ -58,7 +58,7 @@ ed<template>
         <el-form-item :label="$t('对外备注')">
           <el-input v-model="form.remarks" :placeholder="$t('对外备注备注')"></el-input>
         </el-form-item>
-        <el-form-item :label="$t('对内备注')">
+        <el-form-item :label="$t('对内备注')" v-if="tool.checkAuth($route.name,'internalNote')">
           <el-input v-model="form.remarks_in" :placeholder="$t('对内备注')"></el-input>
         </el-form-item>
       </el-form>

+ 1 - 1
src/HDrpManagement/recvoucher/details/index.vue

@@ -3,7 +3,7 @@
     <basicDetails
         ref="details"
         :titleText="mainData.billno"
-        formPath="revoucher"
+        formPath="recvoucher"
         :editData="mainData"
         :mainAreaData="mainAreaData"
         :turnPageId="20221010102903"

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

@@ -19,9 +19,9 @@
           <el-select v-model="status" multiple clearable style="margin-right:10px" size="small" :placeholder="$t(`请选择订单状态`)" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status2 = 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>
+            <el-option value="审核" :label="$t(`审核`)"></el-option>
             <el-option value="关闭" :label="$t(`关闭`)"></el-option>
           </el-select>
         </div>

+ 584 - 321
src/SDrpManagement/salerOrder/details/index.vue

@@ -375,330 +375,593 @@ export default {
     },
     changeDataStructure() {
       let that = this;
-      this.mainAreaData = that.siteid == 'HY'?[
-        {
-          label: "订单状态",
-          value: this.$t(this.mainData.status),
-          style: function () {
-            let style = that.tool.getStatusColor(that.mainData.status);
-            return style;
-          },
-        },
-        {
-          label: "订单类型",
-          value: this.mainData.type,
-        },
-        {
-          label: "明细分类",
-          value: this.mainData.typemx,
-        },
-        {
-          label: "单据日期",
-          value: this.mainData.billdate,
-        },
-        {
-          label: "企业名称",
-          value: this.mainData.enterprisename,
-        },
-        {
-          label: "订单总金额",
-          value: this.mainData.defaultamount,
-          style: function () {
-            let style = { color: "#ff0000" };
-            return style;
-          },
-        },
-        {
-          label: "折后总金额",
-          value: this.tool.formatAmount(this.mainData.amount, 2),
-          style: function () {
-            let style = { color: "#ff0000" };
-            return style;
-          },
-        },
-        {
-          label: "合计数量",
-          value: this.mainData.qty,
-          style: function () {
-            let style = { color: "#ff0000" };
-            return style;
-          },
-        },
-        /*  {
-          label:'合计数量',
-          value:this.mainData.qty,
-          style:function () {
-            let style = {color:"#ff0000"}
-            return style
-          }
-        },
-        {
-          label:'合计金额',
-          value:this.mainData.amount,
-          style:function () {
-            let style = {color:"#ff0000"}
-            return style
-          }
-        },
-        {
-          label:'折前金额',
-          value:this.mainData.defaultamount,
-          style:function () {
-            let style = {color:"#ff0000"}
-            return style
-          }
-        },*/
-        /*{
-          label:'企业名称',
-          value:this.mainData.enterprisename
-        },*/
-        // {
-        //   label:'收货地址',
-        //   value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}-${this.mainData.address}`
-        // },
-        {
-          label: "品牌",
-          value: this.mainData.brandname,
-        },
-        {
-          label: "领域",
-          value: this.$t(this.mainData.tradefield),
-        },
-        {
-          label: "领域明细",
-          value: this.mainData.tradefieldmx,
-        },
-        {
-          label: "评审类型",
-          value: this.mainData.optiontyperemarks
-            ? this.mainData.reviewtype + "-" + this.mainData.optiontyperemarks
-            : this.mainData.reviewtype,
-        },
-        {
-          label: "业务员",
-          value: this.mainData.saler_name,
-        },
-        {
-          label: "项目信息",
-          value: this.mainData.contract_title,
-        },
-        {
-          label: "销售分类",
-          value: this.mainData.saletype,
-        },
-        {
-          label: "运费方式",
-          value: this.$t(this.mainData.freightstatus),
-        },
-        {
-          label: "对外备注",
-          value: this.mainData.remarks,
-        },
-        {
-          label: "对内备注",
-          value: this.mainData.remarks_in,
-        },
-        {
-          label: "退回原因",
-          value: this.mainData.backreason,
-        },
-        {
-          label: "核销状态",
-          value: this.mainData.writeoffstatus,
-          style:function () {
-            let style = that.tool.getStatusColor(that.mainData.writeoffstatus)
-            return style
-          }
-        },
-        {
-          label: "开票状态",
-          value: this.mainData.invoicestatus,
-          style:function () {
-            let style = that.tool.getStatusColor(that.mainData.invoicestatus)
-            return style
-          }
-        },
-        {
-          label:'备货状态',
-          value:this.$t(this.mainData.goodsstatus),
-          style:function () {
-            let style = {}
-            switch (that.mainData.goodsstatus) {
-              case '已完成':
-                style = {color:"#67C23A"}
-                break;
-              case '未完成':
-                style = {color:"#F56C6C"}
-                break;
-              case '部分完成':
-                style = {color:"#e6a23c"}
-                break;
-              default:
-                break;
+      if (that.siteid == 'HY'){
+        if (this.tool.checkAuth(this.$route.name,'internalNote')){
+          this.mainAreaData = [
+            {
+              label: "订单状态",
+              value: this.$t(this.mainData.status),
+              style: function () {
+                let style = that.tool.getStatusColor(that.mainData.status);
+                return style;
+              },
+            },
+            {
+              label: "订单类型",
+              value: this.mainData.type,
+            },
+            {
+              label: "明细分类",
+              value: this.mainData.typemx,
+            },
+            {
+              label: "单据日期",
+              value: this.mainData.billdate,
+            },
+            {
+              label: "企业名称",
+              value: this.mainData.enterprisename,
+            },
+            {
+              label: "订单总金额",
+              value: this.mainData.defaultamount,
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "折后总金额",
+              value: this.tool.formatAmount(this.mainData.amount, 2),
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "合计数量",
+              value: this.mainData.qty,
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            /*  {
+              label:'合计数量',
+              value:this.mainData.qty,
+              style:function () {
+                let style = {color:"#ff0000"}
+                return style
+              }
+            },
+            {
+              label:'合计金额',
+              value:this.mainData.amount,
+              style:function () {
+                let style = {color:"#ff0000"}
+                return style
+              }
+            },
+            {
+              label:'折前金额',
+              value:this.mainData.defaultamount,
+              style:function () {
+                let style = {color:"#ff0000"}
+                return style
+              }
+            },*/
+            /*{
+              label:'企业名称',
+              value:this.mainData.enterprisename
+            },*/
+            // {
+            //   label:'收货地址',
+            //   value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}-${this.mainData.address}`
+            // },
+            {
+              label: "品牌",
+              value: this.mainData.brandname,
+            },
+            {
+              label: "领域",
+              value: this.$t(this.mainData.tradefield),
+            },
+            {
+              label: "领域明细",
+              value: this.mainData.tradefieldmx,
+            },
+            {
+              label: "评审类型",
+              value: this.mainData.optiontyperemarks
+                  ? this.mainData.reviewtype + "-" + this.mainData.optiontyperemarks
+                  : this.mainData.reviewtype,
+            },
+            {
+              label: "业务员",
+              value: this.mainData.saler_name,
+            },
+            {
+              label: "项目信息",
+              value: this.mainData.contract_title,
+            },
+            {
+              label: "销售分类",
+              value: this.mainData.saletype,
+            },
+            {
+              label: "运费方式",
+              value: this.$t(this.mainData.freightstatus),
+            },
+            {
+              label: "对外备注",
+              value: this.mainData.remarks,
+            },
+            {
+              label: "对内备注",
+              value: this.mainData.remarks_in,
+            },
+            {
+              label: "退回原因",
+              value: this.mainData.backreason,
+            },
+            {
+              label: "核销状态",
+              value: this.mainData.writeoffstatus,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.writeoffstatus)
+                return style
+              }
+            },
+            {
+              label: "开票状态",
+              value: this.mainData.invoicestatus,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.invoicestatus)
+                return style
+              }
+            },
+            {
+              label:'备货状态',
+              value:this.$t(this.mainData.goodsstatus),
+              style:function () {
+                let style = {}
+                switch (that.mainData.goodsstatus) {
+                  case '已完成':
+                    style = {color:"#67C23A"}
+                    break;
+                  case '未完成':
+                    style = {color:"#F56C6C"}
+                    break;
+                  case '部分完成':
+                    style = {color:"#e6a23c"}
+                    break;
+                  default:
+                    break;
+                }
+                return style
+              }
+            },
+            {
+              label: "项目备注",
+              value: this.mainData.projectnote,
+            },
+            {
+              label:'关联合同',
+              value:this.mainData.contract_title
             }
-            return style
-          }
-        },
-        {
-          label: "项目备注",
-          value: this.mainData.projectnote,
-        },
-        {
-          label:'关联合同',
-          value:this.mainData.contract_title
+          ]
+        }else {
+          this.mainAreaData = [
+            {
+              label: "订单状态",
+              value: this.$t(this.mainData.status),
+              style: function () {
+                let style = that.tool.getStatusColor(that.mainData.status);
+                return style;
+              },
+            },
+            {
+              label: "订单类型",
+              value: this.mainData.type,
+            },
+            {
+              label: "明细分类",
+              value: this.mainData.typemx,
+            },
+            {
+              label: "单据日期",
+              value: this.mainData.billdate,
+            },
+            {
+              label: "企业名称",
+              value: this.mainData.enterprisename,
+            },
+            {
+              label: "订单总金额",
+              value: this.mainData.defaultamount,
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "折后总金额",
+              value: this.tool.formatAmount(this.mainData.amount, 2),
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "合计数量",
+              value: this.mainData.qty,
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "品牌",
+              value: this.mainData.brandname,
+            },
+            {
+              label: "领域",
+              value: this.$t(this.mainData.tradefield),
+            },
+            {
+              label: "领域明细",
+              value: this.mainData.tradefieldmx,
+            },
+            {
+              label: "评审类型",
+              value: this.mainData.optiontyperemarks
+                  ? this.mainData.reviewtype + "-" + this.mainData.optiontyperemarks
+                  : this.mainData.reviewtype,
+            },
+            {
+              label: "业务员",
+              value: this.mainData.saler_name,
+            },
+            {
+              label: "项目信息",
+              value: this.mainData.contract_title,
+            },
+            {
+              label: "销售分类",
+              value: this.mainData.saletype,
+            },
+            {
+              label: "运费方式",
+              value: this.$t(this.mainData.freightstatus),
+            },
+            {
+              label: "对外备注",
+              value: this.mainData.remarks,
+            },
+            {
+              label: "退回原因",
+              value: this.mainData.backreason,
+            },
+            {
+              label: "核销状态",
+              value: this.mainData.writeoffstatus,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.writeoffstatus)
+                return style
+              }
+            },
+            {
+              label: "开票状态",
+              value: this.mainData.invoicestatus,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.invoicestatus)
+                return style
+              }
+            },
+            {
+              label:'备货状态',
+              value:this.$t(this.mainData.goodsstatus),
+              style:function () {
+                let style = {}
+                switch (that.mainData.goodsstatus) {
+                  case '已完成':
+                    style = {color:"#67C23A"}
+                    break;
+                  case '未完成':
+                    style = {color:"#F56C6C"}
+                    break;
+                  case '部分完成':
+                    style = {color:"#e6a23c"}
+                    break;
+                  default:
+                    break;
+                }
+                return style
+              }
+            },
+            {
+              label: "项目备注",
+              value: this.mainData.projectnote,
+            },
+            {
+              label:'关联合同',
+              value:this.mainData.contract_title
+            }
+          ]
         }
-      ]:[
-        {
-          label: "订单状态",
-          value: this.$t(this.mainData.status),
-          style: function () {
-            let style = that.tool.getStatusColor(that.mainData.status);
-            return style;
-          },
-        },
-        {
-          label: "订单类型",
-          value: this.mainData.type,
-        },
-        {
-          label: "明细分类",
-          value: this.mainData.typemx,
-        },
-        {
-          label: "单据日期",
-          value: this.mainData.billdate,
-        },
-        {
-          label: "企业名称",
-          value: this.mainData.enterprisename,
-        },
-        {
-          label: "订单总金额",
-          value: this.mainData.defaultamount,
-          style: function () {
-            let style = { color: "#ff0000" };
-            return style;
-          },
-        },
-        {
-          label: "折后总金额",
-          value: this.tool.formatAmount(this.mainData.amount, 2),
-          style: function () {
-            let style = { color: "#ff0000" };
-            return style;
-          },
-        },
-        {
-          label: "合计数量",
-          value: this.mainData.qty,
-          style: function () {
-            let style = { color: "#ff0000" };
-            return style;
-          },
-        },
-        /*  {
-          label:'合计数量',
-          value:this.mainData.qty,
-          style:function () {
-            let style = {color:"#ff0000"}
-            return style
-          }
-        },
-        {
-          label:'合计金额',
-          value:this.mainData.amount,
-          style:function () {
-            let style = {color:"#ff0000"}
-            return style
-          }
-        },
-        {
-          label:'折前金额',
-          value:this.mainData.defaultamount,
-          style:function () {
-            let style = {color:"#ff0000"}
-            return style
-          }
-        },*/
-        /*{
-          label:'企业名称',
-          value:this.mainData.enterprisename
-        },*/
-        // {
-        //   label:'收货地址',
-        //   value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}-${this.mainData.address}`
-        // },
-        {
-          label: "品牌",
-          value: this.mainData.brandname,
-        },
-        {
-          label: "领域",
-          value: this.$t(this.mainData.tradefield),
-        },
-        {
-          label: "领域明细",
-          value: this.mainData.tradefieldmx,
-        },
-        {
-          label: "评审类型",
-          value: this.mainData.optiontyperemarks
-              ? this.mainData.reviewtype + "-" + this.mainData.optiontyperemarks
-              : this.mainData.reviewtype,
-        },
-        {
-          label: "业务员",
-          value: this.mainData.saler_name,
-        },
-        {
-          label: "项目信息",
-          value: this.mainData.contract_title,
-        },
-        {
-          label: "销售分类",
-          value: this.mainData.saletype,
-        },
-        {
-          label: "运费方式",
-          value: this.$t(this.mainData.freightstatus),
-        },
-        {
-          label: "对外备注",
-          value: this.mainData.remarks,
-        },
-        {
-          label: "对内备注",
-          value: this.mainData.remarks_in,
-        },
-        {
-          label: "退回原因",
-          value: this.mainData.backreason,
-        },
-        {
-          label: "核销状态",
-          value: this.mainData.writeoffstatus,
-          style:function () {
-            let style = that.tool.getStatusColor(that.mainData.writeoffstatus)
-            return style
-          }
-        },
-        {
-          label: "开票状态",
-          value: this.mainData.invoicestatus,
-          style:function () {
-            let style = that.tool.getStatusColor(that.mainData.invoicestatus)
-            return style
-          }
-        },
-        {
-          label: "项目备注",
-          value: this.mainData.projectnote,
-        },
-        {
-          label:'关联合同',
-          value:this.mainData.contract_title
+      }else {
+        if (this.tool.checkAuth(this.$route.name,'internalNote')){
+          this.mainAreaData = [
+            {
+              label: "订单状态",
+              value: this.$t(this.mainData.status),
+              style: function () {
+                let style = that.tool.getStatusColor(that.mainData.status);
+                return style;
+              },
+            },
+            {
+              label: "订单类型",
+              value: this.mainData.type,
+            },
+            {
+              label: "明细分类",
+              value: this.mainData.typemx,
+            },
+            {
+              label: "单据日期",
+              value: this.mainData.billdate,
+            },
+            {
+              label: "企业名称",
+              value: this.mainData.enterprisename,
+            },
+            {
+              label: "订单总金额",
+              value: this.mainData.defaultamount,
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "折后总金额",
+              value: this.tool.formatAmount(this.mainData.amount, 2),
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "合计数量",
+              value: this.mainData.qty,
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            /*  {
+              label:'合计数量',
+              value:this.mainData.qty,
+              style:function () {
+                let style = {color:"#ff0000"}
+                return style
+              }
+            },
+            {
+              label:'合计金额',
+              value:this.mainData.amount,
+              style:function () {
+                let style = {color:"#ff0000"}
+                return style
+              }
+            },
+            {
+              label:'折前金额',
+              value:this.mainData.defaultamount,
+              style:function () {
+                let style = {color:"#ff0000"}
+                return style
+              }
+            },*/
+            /*{
+              label:'企业名称',
+              value:this.mainData.enterprisename
+            },*/
+            // {
+            //   label:'收货地址',
+            //   value:`${this.mainData.province}-${this.mainData.city}-${this.mainData.county}-${this.mainData.address}`
+            // },
+            {
+              label: "品牌",
+              value: this.mainData.brandname,
+            },
+            {
+              label: "领域",
+              value: this.$t(this.mainData.tradefield),
+            },
+            {
+              label: "领域明细",
+              value: this.mainData.tradefieldmx,
+            },
+            {
+              label: "评审类型",
+              value: this.mainData.optiontyperemarks
+                  ? this.mainData.reviewtype + "-" + this.mainData.optiontyperemarks
+                  : this.mainData.reviewtype,
+            },
+            {
+              label: "业务员",
+              value: this.mainData.saler_name,
+            },
+            {
+              label: "项目信息",
+              value: this.mainData.contract_title,
+            },
+            {
+              label: "销售分类",
+              value: this.mainData.saletype,
+            },
+            {
+              label: "运费方式",
+              value: this.$t(this.mainData.freightstatus),
+            },
+            {
+              label: "对外备注",
+              value: this.mainData.remarks,
+            },
+            {
+              label: "对内备注",
+              value: this.mainData.remarks_in,
+            },
+            {
+              label: "退回原因",
+              value: this.mainData.backreason,
+            },
+            {
+              label: "核销状态",
+              value: this.mainData.writeoffstatus,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.writeoffstatus)
+                return style
+              }
+            },
+            {
+              label: "开票状态",
+              value: this.mainData.invoicestatus,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.invoicestatus)
+                return style
+              }
+            },
+            {
+              label: "项目备注",
+              value: this.mainData.projectnote,
+            },
+            {
+              label:'关联合同',
+              value:this.mainData.contract_title
+            }
+          ]
+        }else {
+          this.mainAreaData = [
+            {
+              label: "订单状态",
+              value: this.$t(this.mainData.status),
+              style: function () {
+                let style = that.tool.getStatusColor(that.mainData.status);
+                return style;
+              },
+            },
+            {
+              label: "订单类型",
+              value: this.mainData.type,
+            },
+            {
+              label: "明细分类",
+              value: this.mainData.typemx,
+            },
+            {
+              label: "单据日期",
+              value: this.mainData.billdate,
+            },
+            {
+              label: "企业名称",
+              value: this.mainData.enterprisename,
+            },
+            {
+              label: "订单总金额",
+              value: this.mainData.defaultamount,
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "折后总金额",
+              value: this.tool.formatAmount(this.mainData.amount, 2),
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "合计数量",
+              value: this.mainData.qty,
+              style: function () {
+                let style = { color: "#ff0000" };
+                return style;
+              },
+            },
+            {
+              label: "品牌",
+              value: this.mainData.brandname,
+            },
+            {
+              label: "领域",
+              value: this.$t(this.mainData.tradefield),
+            },
+            {
+              label: "领域明细",
+              value: this.mainData.tradefieldmx,
+            },
+            {
+              label: "评审类型",
+              value: this.mainData.optiontyperemarks
+                  ? this.mainData.reviewtype + "-" + this.mainData.optiontyperemarks
+                  : this.mainData.reviewtype,
+            },
+            {
+              label: "业务员",
+              value: this.mainData.saler_name,
+            },
+            {
+              label: "项目信息",
+              value: this.mainData.contract_title,
+            },
+            {
+              label: "销售分类",
+              value: this.mainData.saletype,
+            },
+            {
+              label: "运费方式",
+              value: this.$t(this.mainData.freightstatus),
+            },
+            {
+              label: "对外备注",
+              value: this.mainData.remarks,
+            },
+            {
+              label: "退回原因",
+              value: this.mainData.backreason,
+            },
+            {
+              label: "核销状态",
+              value: this.mainData.writeoffstatus,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.writeoffstatus)
+                return style
+              }
+            },
+            {
+              label: "开票状态",
+              value: this.mainData.invoicestatus,
+              style:function () {
+                let style = that.tool.getStatusColor(that.mainData.invoicestatus)
+                return style
+              }
+            },
+            {
+              label: "项目备注",
+              value: this.mainData.projectnote,
+            },
+            {
+              label:'关联合同',
+              value:this.mainData.contract_title
+            }
+          ]
         }
-      ]
+      }
     },
     // 监听切换数据,上一页,下一页
     pageChange(id, rowindex, tabIndex) {

+ 5 - 5
src/SDrpManagement/salerOrder/index.vue

@@ -32,15 +32,15 @@
           >
             <el-option :value="$t(`新建`)" :label="$t(`新建`)"></el-option>
             <el-option :value="$t(`提交`)" :label="$t(`提交`)"></el-option>
-            <el-option :value="$t(`审核`)" :label="$t(`审核`)"></el-option>
             <el-option
-              :value="$t(`交期待确认`)"
-              :label="$t(`交期待确认`)"
+                :value="$t(`交期待确认`)"
+                :label="$t(`交期待确认`)"
             ></el-option>
             <el-option
-              :value="$t(`交期确认`)"
-              :label="$t(`交期确认`)"
+                :value="$t(`交期确认`)"
+                :label="$t(`交期确认`)"
             ></el-option>
+            <el-option :value="$t(`审核`)" :label="$t(`审核`)"></el-option>
             <el-option :value="$t(`关闭`)" :label="$t(`关闭`)"></el-option>
           </el-select>
         </div>

+ 1 - 1
src/SDrpManagement/salerOrder/modules/edit.vue

@@ -536,7 +536,7 @@
             :placeholder="$t(`请输入对外备注`)"
           ></el-input>
         </div>
-        <div class="normal-margin">
+        <div class="normal-margin" v-if="tool.checkAuth($route.name,'internalNote')">
           <p class="normal-title mt-10 inline-16">{{ $t("对内备注") }}</p>
           <el-input
               size="mini"