海盐站点，订单管理、订货业务、订货订单列表详情页调整

src/HDrpManagement/orderManage/details/index.vue

@@ -254,7 +254,140 @@ export default {
     },
     changeDataStructure() {
       let that = this
-      this.mainAreaData = [
+      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.tool.formatAmount(this.mainData.defaultamount,2),
+          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.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.projectname
+        },
+        {
+          label:'销售分类',
+          value:`${this.mainData.saletype}${this.mainData.saletyperemarks?'-':''}${this.mainData.saletyperemarks}`
+        },
+        {
+          label:'运费状态',
+          value:this.$t(this.mainData.freightstatus)
+        },
+        {
+          label:'备注',
+          value:this.mainData.remarks
+        },
+        /*{
+          label:'返利金使用比例(%)',
+          value:this.mainData.rebate_userate
+        },*/
+        {
+          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 = that.tool.getStatusColor(that.mainData.goodsstatus)
+            return style
+          }
+        },
+        {
+          label:'erp单号',
+          value:this.mainData.erpbillno
+        },
+        {
+          label:'回签单',
+          value:this.mainData.signbackstatus
+        },
+        {
+          label:'项目备注',
+          value:this.mainData.projectnote
+        },
+        {
+          label:'关联合同',
+          value:this.mainData.contract_title
+        }
+      ]:[
         {
           label:'订单状态',
           value:this.$t(this.mainData.status),

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

@@ -229,6 +229,12 @@
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
             {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
+          <div v-else-if="scope.column.columnname === 'bookedqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.data[scope.column.columnname] == 0?'0':'--'}}
+          </div>
+          <div v-else-if="scope.column.columnname === 'logisticsqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.data[scope.column.columnname] == 0?'0':'--'}}
+          </div>
           <div v-else>{{scope.column.columnname === 'operation' || scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname] : '--'}}</div>
         </template>
         <template v-slot:opreation="scope">

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

@@ -2,7 +2,7 @@
   <div>
     <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
     <el-table  ref="table" :fit="tool.calculatedColumnWidth($refs.table,layout)" :row-class-name="tableClassName" highlight-current-row :data="data"  size="mini"  :height="height" @row-click="rowClick" style="width:100%;" :header-cell-style="{height:'40px',color:'#606266',fontWeight:'400',fontSize:'14px'}"
-              :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange">
+              :cell-style="{height:'40px',color:'#666666',fontWeight:'400'}" border @selection-change="selectionChange" >
       <el-table-column
           type="selection"
           width="35" fixed v-if="checkbox">
@@ -88,6 +88,10 @@ export default {
     },
     tableClassName ({row,rowIndex}) {
       row.index = rowIndex
+      if (row.goodsstatus == '已备货') {
+        console.log(row.goodsstatus,'row.goodsstatus')
+        return 'success-row';
+      }
     },
     selectionChange(row){
       this.$emit('selectionChange',row)
@@ -99,6 +103,15 @@ export default {
 }
 
 </script>
+<style>
+.el-table .warning-row {
+  background: oldlace;
+}
+
+.el-table .success-row {
+  background: rgba(103, 194, 58, 0.1);
+}
+</style>
 <style scoped>
 /* 设置滚动条常显示 */
 >>>.el-table__body-wrapper {

src/SDrpManagement/agentOrder/details/index.vue

@@ -359,7 +359,101 @@ export default {
     },
     changeDataStructure() {
       let that = this;
-      this.mainAreaData = [
+      this.mainAreaData = that.siteid == 'HY' ?[
+        {
+          label: "订单类型",
+          value: this.mainData.type,
+        },
+        {
+          label: "订单状态",
+          value: this.$t(this.mainData.status),
+          style: function () {
+            let style = that.tool.getStatusColor(that.mainData.status);
+            return style;
+          },
+        },
+        {
+          label: "单据日期",
+          value: this.mainData.billdate,
+        },
+        {
+          label: "合计数量",
+          value: this.mainData.qty,
+          style: function () {
+            let style = { color: "#ff0000" };
+            return style;
+          },
+        },
+        {
+          // {{tool.formatAmount(scope.row.marketprice,2)}}
+          label: "合计金额",
+          value: this.tool.formatAmount(this.mainData.defaultamount, 2),
+          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.enterprisename
+        },*/
+        {
+          label: "销售分类",
+          value: this.mainData.saletype,
+        },
+        {
+          label: "备注",
+          value: this.mainData.remarks,
+        },
+        {
+          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 = that.tool.getStatusColor(that.mainData.goodsstatus)
+            return style
+          }
+        },
+        {
+          label: "运费状态",
+          value: this.$t(this.mainData.freightstatus),
+        },
+        {
+          label: "项目名称",
+          value: this.mainData.projectname,
+        },
+        {
+          label: "项目备注",
+          value: this.mainData.projectnote,
+        },
+        {
+          label: "退回原因",
+          value: this.mainData.backreason,
+        },
+      ]:[
         {
           label: "订单类型",
           value: this.mainData.type,

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -200,6 +200,12 @@
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
             {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
+          <div v-else-if="scope.column.columnname === 'bookedqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.data[scope.column.columnname] == 0?'0':'--'}}
+          </div>
+          <div v-else-if="scope.column.columnname === 'logisticsqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.data[scope.column.columnname] == 0?'0':'--'}}
+          </div>
           <p v-else>{{ $t(scope.column.data[scope.column.columnname]) || '--'}}</p>
         </template>
         <template v-slot:opreation="scope">

src/SDrpManagement/salerOrder/details/index.vue

@@ -310,7 +310,8 @@ export default {
       rebateamount: "",
       typeNew:'',
       fullscreenLoading:false,
-      selection:[]
+      selection:[],
+      siteid:JSON.parse(sessionStorage.getItem('active_account')).siteid
     };
   },
   provide() {
@@ -374,7 +375,7 @@ export default {
     },
     changeDataStructure() {
       let that = this;
-      this.mainAreaData = [
+      this.mainAreaData = that.siteid == 'HY'?[
         {
           label: "订单状态",
           value: this.$t(this.mainData.status),
@@ -513,6 +514,161 @@ export default {
             return style
           }
         },
+        {
+          label:'备货状态',
+          value:this.$t(this.mainData.goodsstatus),
+          style:function () {
+            let style = that.tool.getStatusColor(that.mainData.goodsstatus)
+            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.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,
@@ -521,7 +677,7 @@ export default {
           label:'关联合同',
           value:this.mainData.contract_title
         }
-      ];
+      ]
     },
     // 监听切换数据,上一页,下一页
     pageChange(id, rowindex, tabIndex) {

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -206,6 +206,12 @@
           <div v-else-if="scope.column.columnname === 'nominalpressure'">
             {{tool.nominalPressureSet(scope.column.data.nominalpressure)}}
           </div>
+          <div v-else-if="scope.column.columnname === 'bookedqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.data[scope.column.columnname] == 0?'0':'--'}}
+          </div>
+          <div v-else-if="scope.column.columnname === 'logisticsqty'">
+            {{scope.column.data[scope.column.columnname]?scope.column.data[scope.column.columnname]:scope.column.data[scope.column.columnname] == 0?'0':'--'}}
+          </div>
           <p v-else>{{ $t(scope.column.data[scope.column.columnname]) || '--' }}</p>
         </template>
         <template v-slot:opreation="scope">