Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/ProductMag/detail/index.vue

@@ -61,6 +61,16 @@
           class="inline-16"
           v-if="tool.checkAuth($route.name,'isBottom') && mainData.isonsale == 1"
         />
+        <customBtn 
+          btnName="删 除"
+          message="确认删除当前商品吗?"
+          idName="20220923152202"
+          keyName="itemids"
+          :id="[$route.query.id]"
+          @onSuccess="$router.back()"
+          class="inline-16"
+          v-if="tool.checkAuth($route.name,'delete') && mainData.status == '新建'"
+        />
       </div>
       <div slot="slot0" >
         <detail_data :basic="mainData"></detail_data>

src/HDrpManagement/contractManage/modules/detail.vue

@@ -25,8 +25,8 @@
           :id="$route.query.id"
           @onSuccess="changeBill"
           class="inline-16"
-          v-if="mainData.status == '审核' && ($route.query.type == '经销项目' || $route.query.type == '直销项目') && (tool.checkAuth($route.name,'changeBillMag') || tool.checkAuth($route.name,'changeBillSaler') || tool.checkAuth($route.name,'changeBillOrder'))"
         />
+        <!-- v-if="mainData.status == '审核' && ($route.query.type == '经销项目' || $route.query.type == '直销项目') && (tool.checkAuth($route.name,'changeBillMag') || tool.checkAuth($route.name,'changeBillSaler') || tool.checkAuth($route.name,'changeBillOrder'))" -->
         <revoke class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'revoke') && mainData.status === '已提交' && isLeader" ></revoke>
         <submit-check class="inline-16"  :disabled="!isLeader" ref="submit" :data="mainData" @onSuccess="queryMainData" />
         <reverseCheck class="inline-16" @onSuccess="queryMainData()" :data="mainData" v-if="tool.checkAuth($route.name,'reverseCheck') && mainData.status === '审核'"  />

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

@@ -21,28 +21,141 @@
         ></uploadAllData>
       </div>
       <p class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal" v-if="data.status === '新建'">{{checkFreefreightamount}}</p>
-      <!-- <tableLayout :layout="tablecols" :data="tableData" :custom="true" :checkbox="true" fixedName="rowno itemname itemno erpitemno model" redirect="left">
+      <Table 
+        height="calc(100vh - 500px)"
+        ref="multipleTable" 
+        :layout="tablecols" 
+        :data="tableData" 
+        @selectionChange="selectionChange"
+        :custom="true" :checkbox="true" fixedName="rowno itemname itemno erpitemno model" redirect="left" :headerOptions="['needdate','deliverydate']">
+        <template v-slot:header="scope">
+          <div v-if="scope.column.columnname == 'needdate'">
+            <el-date-picker
+              style="width:150px"
+              v-if="data.status === '新建'"
+              v-model="value2"
+              value-format="yyyy-MM-dd"
+              slot="reference"
+              align="right"
+              type="date"
+              size="mini"
+              placeholder="一键填写需求日期"
+              @change="dateChangeNeed">
+            </el-date-picker>
+            <span v-else>需求日期</span>
+          </div>
+          <div v-if="scope.column.columnname == 'deliverydate'">
+            <el-date-picker
+              style="width:180px"
+              v-if="type === 'confirmdate'"
+              v-model="value2"
+              value-format="yyyy-MM-dd"
+              slot="reference"
+              align="right"
+              type="date"
+              size="mini"
+              placeholder="一键回复交期"
+              @change="dateChange">
+            </el-date-picker>
+            <span v-else>回复交期</span>
+          </div>
+        </template>
         <template v-slot:customcol="scope">
-        
-          <p v-if="scope.column.columnname === 'status'">
-            <span :style="scope.column.data.status === '启用'?'color:#52C41A':'color:#FF3B30'">{{scope.column.data.status}}</span>
-          </p>
-          <p v-else-if="scope.column.columnname === 'province'">
-            <span>{{scope.column.data.province}} - {{scope.column.data.city}} - {{scope.column.data.county}}</span>
-          </p>
+          <div v-if="scope.column.columnname === 'qty'">
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="data.status === '新建' && data.type !=='特殊订单'" size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="输入数量" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
+            <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-else-if="data.status === '新建' && data.type ==='特殊订单'" size="mini" v-model="scope.column.data.qty" label="输入数量" @change="rowChange(scope.column.data,scope.$index)"></el-input-number>
+            <span v-else>{{scope.column.data.qty}}</span>
+          </div>
+          <div v-else-if="scope.column.columnname === 'needdate'">
+            <el-date-picker
+              v-if="scope.column.data.delivery > 0 && data.status === '新建'"
+                v-model="scope.column.data.needdate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+                size="mini"
+                style="width:150px"
+                :picker-options="pickerOptions1"
+                @change="rowChange(scope.column.data)">
+              </el-date-picker>
+              <div v-else>
+                <p v-if="scope.column.data.delivery === 0 ">不管控交期</p>
+                <p v-else>{{scope.column.data.needdate}}</p>
+              </div>
+          </div>
+          <div v-else-if="scope.column.columnname === 'deliverydate'">
+            <el-date-picker
+              v-if="scope.column.data.delivery > 0 && type === 'confirmdate'"
+                v-model="scope.column.data.deliverydate"
+                type="date"
+                placeholder="选择日期"
+                value-format="yyyy-MM-dd"
+                size="mini"
+                style="width:150px"
+                :picker-options="pickerOptions"
+                @change="onDateChange(scope.column.data)"
+                @focus="setPickerOptions(scope.column.data)">
+              </el-date-picker>
+              <div v-else>
+                <p v-if="scope.column.data.delivery === 0 ">不管控交期</p>
+                <p v-else>{{scope.column.data.deliverydate}}</p>
+              </div>
+          </div>
+          <div v-else-if="scope.column.columnname === 'unit'">
+            <el-tag size="mini" type="info" effect="plain">{{scope.column.data.unit}}</el-tag>
+          </div>
+          <div v-else-if="scope.column.columnname === 'marketprice'">
+            <p>¥&nbsp;{{tool.formatAmount(scope.column.data.marketprice,2)}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname === 'defaultprice'">
+            <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model="scope.column.data.defaultprice"  placeholder="输入订单备注" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
+            <p v-else>¥&nbsp;{{tool.formatAmount(scope.column.data.defaultprice,2)}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname === 'defaultamount'">
+            <p>¥&nbsp;{{tool.formatAmount(scope.column.data.defaultamount,2)}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname === 'price'">
+            <p>¥&nbsp;{{tool.formatAmount(scope.column.data.price,2)}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname === 'amount'">
+            <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.amount,2)}}</p>
+          </div>
+          <div v-else-if="scope.column.columnname === 'stockname'">
+            <el-select v-model="scope.column.data.stockno" size="mini" @visible-change="queryStock(scope.column.data)" placeholder="请选择">
+              <el-option
+                v-for="item in stockOptions"
+                :key="item.WAREHOUSE"
+                :label="item.WAREHOUSE"
+                :value="item.WAREHOUSE"
+                @click.native="stockChange(item,scope.column.data,scope.$index)">
+                <span>{{ item.WAREHOUSE }}</span>
+                <div style="float: right; color: #8492a6; font-size: 13px">数量:{{item.qty}}仓位:{{ item.LOCATION }}/批号:{{ item.LOT }}</div>
+              </el-option>
+            </el-select>
+          </div>
+          <div v-else-if="scope.column.columnname === 'position'">
+            <el-input size="mini" readonly v-model="scope.column.data.position" @input="rowChange(scope.column.data,scope.$index)" placeholder="输入仓位"></el-input>
+          </div>
+          <div v-else-if="scope.column.columnname === 'batchno'">
+            <el-input size="mini" readonly v-model="scope.column.data.batchno" @input="rowChange(scope.column.data,scope.$index)" placeholder="输入批号"></el-input>
+          </div>
+          <div v-else-if="scope.column.columnname === 'remarks'">
+            <el-input  type="textarea" v-model="scope.column.data.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.column.data,scope.$index)"></el-input>
+          </div>
           <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
         </template>
         <template v-slot:opreation="scope">
-          <slot name="detail" :data="scope.data"></slot>
+          <el-button v-if="data.status == '新建'" type="text" size="mini" @click="deleteOrderProduct(scope.data)">删 除</el-button>
         </template>
-      </tableLayout> -->
-      <el-table
+      </Table>
+      <!-- <el-table
         ref="multipleTable"
         :data="tableData"
         size="small"
         max-height="500px"
         stripe
         border
+        lazy
         @selection-change	="selectionChange">
         <el-table-column
           type="selection"
@@ -214,13 +327,6 @@
             <p>¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
           </template>
         </el-table-column>
-        <!-- <el-table-column
-          label="折后价格"
-          prop="totalprice">
-          <template slot-scope="scope">
-            <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
-          </template>
-        </el-table-column> -->
         <el-table-column
           label="折后金额"
           prop="amount">
@@ -316,7 +422,6 @@
           prop="remarks">
           <template slot-scope="scope">
             <el-input v-model="scope.row.remarks" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
-            <!-- <p v-else>{{scope.row.remarks}}</p> -->
           </template>
         </el-table-column>
         <el-table-column v-if="data.status === '新建'" width="90" fixed="right">
@@ -324,7 +429,7 @@
             <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
           </template>
         </el-table-column>
-      </el-table>
+      </el-table> -->
       <div style="margin-top:16px;text-align:right">
         <el-pagination
           background
@@ -368,9 +473,11 @@
 import addProduct from '@/template/addProduct/index'
 import excel from '../export_excel.vue'
 import uploadAllData from '@/components/uploadAllData/index'
+import Table from './table'
 export default {
   props:['data','type'],
   components:{
+    Table,
     excel,
     addProduct,
     uploadAllData,
@@ -734,18 +841,27 @@ export default {
     this.listData()
     // this.queryStock()
     this.columnTitle  = []
-    this.$refs.multipleTable.$children.forEach(obj => {
-
+    setTimeout(() => {
+      this.$refs.multipleTable.$refs.table.$children.forEach(obj => {
       let columnChild = {'columnname':obj.prop,'filter':0,'rowindex':'','sequence':'','title':obj.label,'width':obj.width}
       // 存到columnTitle数组中
       this.columnTitle.push(columnChild)
-
     })
-    // console.log(this.columnTitle)
+    },1000)
+    /* 处理宁波站点 */
+    let siteid = JSON.parse(sessionStorage.getItem('active_account')).siteid
+    if (siteid === 'NB' && this.data.type === '特殊订单' && this.data.typemx === '样品') {
+      console.log('宁波');
+      this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols
+    } else {
+      console.log('不宁波');
+      this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols.filter(item => {
+        if (item.columnname != 'stockname' && item.columnname != 'position' && item.columnname != 'batchno') return item
+      })
+    }
   },
   created() {
     this.tablecolsAdd = this.tool.tabelCol(this.$route.name).addProductTable.tablecols
-    this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols
   }
 }
 

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

@@ -0,0 +1,95 @@
+<template>
+  <div>
+    <!-- :header-cell-style="{background:'#EEEEEE',color:'#333'}" -->
+    <el-table  ref="table" :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">
+      <el-table-column
+          type="selection"
+          width="35" fixed v-if="checkbox">
+      </el-table-column>
+      <el-table-column 
+        v-for="col in layout" :key="col.tablecolid" 
+        :prop="col.columnname" 
+        :label="col.title" 
+        :width="width && col.width === 0 ? 150 : col.width" 
+        :fixed="fixedCalc(col.columnname)"
+      >
+        <template :slot="headerOptions ? headerOptions.includes(col.columnname) ? 'header' : '' : ''" slot-scope="scope">
+          <slot name="header" :column="{data:scope.row,columnname:col.columnname}"></slot>
+        </template>
+        <template slot-scope="scope">
+          <div class="table-panel">
+            <!-- 自定义表格显示内容 -->
+            <slot v-if="custom" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+            <!-- 否则就是默认 -->
+            <span v-else>{{scope.row[col.columnname]}}</span>
+            <!-- 操作结构内容 -->
+            <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
+          </div>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import { log } from '@antv/g2plot/lib/utils'
+import {mapGetters} from "vuex"
+export default {
+  /*
+    layout:表结构数据;
+    data:表渲染数据;
+    custom:是否启用自定义结构;
+    opwidth:操作列宽度
+  */
+  props:['layout','data','custom','height','fixedName','width','checkbox','redirect','headerOptions'],
+  data () {
+    return {
+      list:[],
+    }
+  },
+  computed:{
+    ...mapGetters({
+      loading:'loading'
+    }),
+    fixedCalc () {
+      return function (col) {
+        if (col == 'operation') {
+          return 'right'
+        }
+        if(this.fixedName) {
+          if (this.fixedName.indexOf(col)!= -1) {
+            if (this.redirect) {
+              return this.redirect
+            } else {
+              return 'right'
+            }
+          } else {
+            return false
+          }
+        } else {
+          return false
+        } 
+      }
+      
+    }
+  },
+  methods:{
+    rowClick (row) {
+      this.$emit('rowClick',row)
+    },
+    tableClassName ({row,rowIndex}) {
+      row.index = rowIndex
+    },
+    selectionChange(row){
+      this.$emit('selectionChange',row)
+    },
+    
+  },
+  mounted () {
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -3,7 +3,6 @@
     <basicDetails
       ref="details"
       :titleText="`单号:${mainData.sonum}`"
-      :oldFormPath="{edit:'HDrpManagement/toolBorrowingMag/modules'}"
       :editData="mainData"
       :mainAreaData="mainAreaData"
       turnPageId="20230114105002"
@@ -15,6 +14,7 @@
       @pageChange="pageChange"
       @onEditSuccess="onEditSuccess">
       <div slot="customOperation" class="inline-16">
+          <Edit v-if="tool.checkAuth($route.name,'update') && mainData.status == '新建'" class="inline-16" @onSuccess="queryMainData()" :data="mainData" />
           <el-button v-if="tool.checkAuth($route.name,'confirmDate')" :disabled="mainData.status !== '交期待确认'" class="inline-16"  type="primary" size="mini" @click="confirmdate">确认交期</el-button>
           <confirmDate v-if="tool.checkAuth($route.name,'replyDate')" class="inline-16" :data="mainData" @onSuccess="queryMainData"></confirmDate>
           <el-popover
@@ -73,6 +73,7 @@ import confirmDate from '../modules/confirmDate.vue'
 import dispatch from './tabs/dispatch.vue'
 import logistics from './tabs/logistics.vue'
 import revenue from './tabs/revenueAndExp.vue'
+import Edit from '../modules/edit'
 
 export default {
   name: "detail",
@@ -98,6 +99,7 @@ export default {
     dispatch,
     logistics,
     revenue,
+    Edit
   },
   methods:{
     async orderreviewtype () {

src/HDrpManagement/toolBorrowingMag/modules/edit.vue

@@ -90,7 +90,7 @@
             </el-popover>
           </div>
           <div class="reveive__panel">
-            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
+            <p><span class="inline-16"><b>{{defaultData.re_info.enterprisename}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
             <small>{{defaultData.re_info.province}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:'--'}}</small>
           </div>
         </div>
@@ -279,6 +279,9 @@ export default {
       this.defaultData.tradefieldmx = this.data.tradefieldmx
       this.defaultData.billdate = this.data.billdate
       this.defaultData.toolcount = this.data.toolcount
+
+      this.defaultData.re_info = this.data.pay_finance[0]
+
     },
     async queryAgentiInfo () {
       const res = await this.$api.requested({

src/HManagement/archives_sc/list/modules/details.vue

@@ -260,7 +260,7 @@ export default {
     //详情页禁用操作
     setTimeout(() => {
       this.$store.dispatch('pageOnlyRead',true)
-    },500)
+    },1000)
   },
   mounted () {
     setTimeout(() => {

src/HManagement/department/staff/list/modules/add.vue

@@ -82,7 +82,7 @@
               <selectMenber @selectMenber="selectMenber"></selectMenber>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="5">
+          <el-col class="mb-30" :span="5" style="height:51px">
             <el-form-item>
               <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
             </el-form-item>
@@ -92,6 +92,14 @@
               <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <el-radio-group v-model="form.status">
+                <el-radio :label="0">在职</el-radio>
+                <el-radio :label="1">离职</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
     </div>
@@ -190,7 +198,8 @@ export default {
         "position":"",
         "reporthrid":"",
         "isworker":"",
-        "userid":"0"
+        "userid":"0",
+        'status':0
       },
       value:[],
       drawer:false,
@@ -214,6 +223,7 @@ export default {
   methods:{
     onShow () {
       this.dialogFormVisible = true
+      this.form.status = 0
       // this.form.depname = this.depInfo.data.label
       // this.form.departmentid = this.depInfo.data.departmentid
       this.$store.dispatch('optiontypeselect','sex')

src/HManagement/department/staff/list/modules/edit.vue

@@ -83,7 +83,7 @@
               <selectMenber @selectMenber="selectMenber"></selectMenber>
             </el-form-item>
           </el-col>
-          <el-col class="mb-30" :span="5">
+          <el-col class="mb-30" :span="5" style="height:51px">
             <el-form-item>
               <el-checkbox v-model="form.isleader" :false-label="0" :true-label="1">是否部门负责人</el-checkbox>
             </el-form-item>
@@ -93,6 +93,14 @@
               <el-checkbox v-model="form.isworker" :false-label="0" :true-label="1">是否服务人员</el-checkbox>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item>
+              <el-radio-group v-model="form.status">
+                <el-radio :label="0">在职</el-radio>
+                <el-radio :label="1">离职</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
         </el-form>
       </el-row>
     </div>
@@ -153,7 +161,8 @@ export default {
         "isleader":"",
         "position":"",
         "reporthrid":"",
-        "userid":"0"
+        "userid":"0",
+        "statue":0,
       },
       value:[],
       deplist:[]

src/SDrpManagement/agentOrder/details/index.vue

@@ -8,7 +8,6 @@
         turnPageId="20221224180302"
         idname="sa_orderid"
         ownertable="sa_order"
-        delApiId="20221108152102"
         tags=""
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'},{key:'status',value:'关闭'}]"
         :tabs="['订单明细','基本信息','订单进度','居间费明细','物流单','发票记录','收支明细']"
@@ -28,8 +27,17 @@
             class="inline-16"
             v-if="mainData.status == '提交' && tool.checkAuth($route.name,'reback')"
           />
-          <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
-          
+          <el-button class="inline-16" v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
+          <customBtn 
+            btnName="删 除"
+            message="确认删除当前订单吗?"
+            idName="20221108152102"
+            keyName="sa_orderids"
+            :id="[$route.query.id]"
+            @onSuccess="$router.back()"
+            class="inline-16"
+            v-if="mainData.status == '新建' && mainData.type != '特殊订单' && tool.checkAuth($route.name,'delete')"
+          />
       </div>
       <div slot="slot1">
         <default-info :mainData="mainData"></default-info>

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -20,7 +20,84 @@
       ></uploadAllData>
     </div>
     <p v-if="data.status === '新建'" class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal">{{checkFreefreightamount}}</p>
-    <el-table
+    <Table 
+      height="calc(100vh - 500px)"
+      ref="multipleTable" 
+      :layout="tablecols" 
+      :data="tableData" 
+      :custom="true" :checkbox="true" fixedName="rowno itemname itemno erpitemno model" redirect="left" :headerOptions="['needdate']">
+      <template v-slot:header="scope">
+        <div v-if="scope.column.columnname == 'needdate'">
+          <el-date-picker
+            style="width:180px"
+            v-if="data.status === '新建'"
+            v-model="value2"
+            value-format="yyyy-MM-dd"
+            slot="reference"
+            align="right"
+            type="date"
+            size="mini"
+            placeholder="一键交期"
+            @change="dateChange(scope.column.data)">
+          </el-date-picker>
+          <span v-else>需求日期</span>
+        </div>
+      </template>
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'qty'">
+          <el-input-number 
+            :controls="true" controls-position='right' 
+            :step-strictly="true" 
+            v-if="data.status === '新建' && data.type != '特殊订单'" 
+            size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="输入数量" @change="qtyChange(scope.column.data,scope.$index)"></el-input-number>
+          <span v-else>{{scope.column.data.qty}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname === 'needdate'">
+          <el-date-picker
+            v-if="scope.column.data.delivery > 0 && data.status === '新建'"
+            v-model="scope.column.data.needdate"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            size="mini"
+            style="width:150px"
+            :picker-options="pickerOptions"
+            @change="onDateChange(scope.column.data)"
+            @focus="setPickerOptions(scope.column.data)">
+          </el-date-picker>
+          <div v-else>
+            <p v-if="scope.column.data.delivery === 0 ">不管控交期</p>
+            <p v-else>{{scope.column.data.needdate}}</p>
+          </div>
+        </div>
+        <div v-else-if="scope.column.columnname === 'unit'">
+          <el-tag size="mini" type="info" effect="plain">{{scope.column.data.unit}}</el-tag>
+        </div>
+        <div v-else-if="scope.column.columnname === 'marketprice'">
+          <p>¥&nbsp;{{tool.formatAmount(scope.column.data.marketprice,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'defaultprice'">
+          <p>¥&nbsp;{{tool.formatAmount(scope.column.data.defaultprice,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'defaultamount'">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.defaultprice * scope.column.data.qty,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'price'">
+          <p>¥&nbsp;{{tool.formatAmount(scope.column.data.price,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'amount'">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.amount,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'remarks'">
+          <el-input type="textarea" v-model="scope.column.data.remarks" placeholder="输入订单备注" size="mini" @blur="onConfirm([scope.column.data],true,true)"></el-input>
+        </div>
+        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+      <template v-slot:opreation="scope">
+        <el-button v-if="data.status == '新建' && data.type != '特殊订单'" type="text" size="mini" @click="deleteOrderProduct(scope.data)">删 除</el-button>
+      </template>
+    </Table>
+    <!-- <el-table
       ref="multipleTable"
       :data="tableData"
       height="500px"
@@ -215,7 +292,7 @@
           <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
         </template>
       </el-table-column>
-    </el-table>
+    </el-table> -->
     <div style="margin-top:16px;text-align:right">
       <el-pagination
         background
@@ -248,6 +325,7 @@
 // import addProduct from '@/template/orderCanUseProduct/index.vue'
 import addProduct from '@/template/addProduct/index'
 import uploadAllData from '@/components/uploadAllData/index'
+import Table from '@/HDrpManagement/orderManage/details/tabs/table'
 export default {
   props:['data','type'],
   data () {
@@ -257,6 +335,7 @@ export default {
       setcol:24,
       dataRefresh:true,
       tableData:[],
+      tablecols:[],
       columnTitle:[],
       excelTitle:'订单明细',
       param:{
@@ -314,7 +393,8 @@ export default {
     /*excel:() =>  import('../export_excel'),*/
     excel:() => import('../details/export_excel'),
     addProduct,
-    uploadAllData
+    uploadAllData,
+    Table
   },
   methods:{
 
@@ -553,17 +633,17 @@ export default {
     this.listData()
     console.log("表结构")
     this.columnTitle  = []
-    this.$refs.multipleTable.$children.forEach(obj => {
-
+    setTimeout(() => {
+      this.$refs.multipleTable.$refs.table.$children.forEach(obj => {
       let columnChild = {'columnname':obj.prop,'filter':0,'rowindex':'','sequence':'','title':obj.label,'width':obj.width}
       // 存到columnTitle数组中
       this.columnTitle.push(columnChild)
-
     })
-    // console.log(this.columnTitle)
+    },1000)
   },
   created() {
     this.tablecolsAdd = this.tool.tabelCol(this.$route.name).addProductTable.tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols
   },
   watch:{
     value2 (val) {

src/SDrpManagement/salerOrder/details/index.vue

@@ -8,7 +8,6 @@
         turnPageId="20221111145202"
         idname="sa_orderid"
         ownertable="sa_order"
-        delApiId="20221108152102"
         tags=""
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'},{key:'status',value:'关闭'}]"
         :tabs="['订单明细','基本信息','订单进度','居间费明细','物流单','发票记录','收支明细','核销记录']"
@@ -28,7 +27,17 @@
             class="inline-16"
             v-if="mainData.status == '提交' && tool.checkAuth($route.name,'reback')"
           />
-          <el-button v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
+          <el-button class="inline-16" v-if="tool.checkAuth($route.name,'insert')"  type="primary" size="mini" @click="onCopy">复 制</el-button>
+          <customBtn 
+            btnName="删 除"
+            message="确认删除当前订单吗?"
+            idName="20221111145202"
+            keyName="sa_orderids"
+            :id="[$route.query.id]"
+            @onSuccess="$router.back()"
+            class="inline-16"
+            v-if="mainData.status == '新建' && mainData.type != '特殊订单' && tool.checkAuth($route.name,'delete')"
+          />
       </div>
       <div slot="slot1">
         <default-info :mainData="mainData"></default-info>

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -20,7 +20,84 @@
       ></uploadAllData>
     </div>
     <p v-if="data.status === '新建'" class="normal-margin" style="font-size: 13px !important;color:red;font-weight: normal">{{checkFreefreightamount}}</p>
-    <el-table
+    <Table 
+      height="calc(100vh - 500px)"
+      ref="multipleTable" 
+      :layout="tablecols" 
+      :data="tableData" 
+      :custom="true" :checkbox="true" fixedName="rowno itemname itemno erpitemno model" redirect="left" :headerOptions="['needdate']">
+      <template v-slot:header="scope">
+        <div v-if="scope.column.columnname == 'needdate'">
+          <el-date-picker
+            style="width:180px"
+            v-if="data.status === '新建'"
+            v-model="value2"
+            value-format="yyyy-MM-dd"
+            slot="reference"
+            align="right"
+            type="date"
+            size="mini"
+            placeholder="一键交期"
+            @change="dateChange(scope.column.data)">
+          </el-date-picker>
+          <span v-else>需求日期</span>
+        </div>
+      </template>
+      <template v-slot:customcol="scope">
+        <div v-if="scope.column.columnname === 'qty'">
+          <el-input-number 
+            :controls="true" controls-position='right' 
+            :step-strictly="true" 
+            v-if="data.status === '新建' && data.type != '特殊订单'" 
+            size="mini" v-model="scope.column.data.qty" :min="scope.column.data.orderminqty" :step="scope.column.data.orderaddqty" label="输入数量" @change="qtyChange(scope.column.data,scope.$index)"></el-input-number>
+          <span v-else>{{scope.column.data.qty}}</span>
+        </div>
+        <div v-else-if="scope.column.columnname === 'needdate'">
+          <el-date-picker
+            v-if="scope.column.data.delivery > 0 && data.status === '新建'"
+            v-model="scope.column.data.needdate"
+            type="date"
+            placeholder="选择日期"
+            value-format="yyyy-MM-dd"
+            size="mini"
+            style="width:150px"
+            :picker-options="pickerOptions"
+            @change="onDateChange(scope.column.data)"
+            @focus="setPickerOptions(scope.column.data)">
+          </el-date-picker>
+          <div v-else>
+            <p v-if="scope.column.data.delivery === 0 ">不管控交期</p>
+            <p v-else>{{scope.column.data.needdate}}</p>
+          </div>
+        </div>
+        <div v-else-if="scope.column.columnname === 'unit'">
+          <el-tag size="mini" type="info" effect="plain">{{scope.column.data.unit}}</el-tag>
+        </div>
+        <div v-else-if="scope.column.columnname === 'marketprice'">
+          <p>¥&nbsp;{{tool.formatAmount(scope.column.data.marketprice,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'defaultprice'">
+          <p>¥&nbsp;{{tool.formatAmount(scope.column.data.defaultprice,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'defaultamount'">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.defaultprice * scope.column.data.qty,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'price'">
+          <p>¥&nbsp;{{tool.formatAmount(scope.column.data.price,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'amount'">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.column.data.amount,2)}}</p>
+        </div>
+        <div v-else-if="scope.column.columnname === 'remarks'">
+          <el-input type="textarea" v-model="scope.column.data.remarks" placeholder="输入订单备注" size="mini" @blur="onConfirm([scope.column.data],true,true)"></el-input>
+        </div>
+        <p v-else>{{scope.column.data[scope.column.columnname]}}</p>
+      </template>
+      <template v-slot:opreation="scope">
+        <el-button v-if="data.status == '新建' && data.type != '特殊订单'" type="text" size="mini" @click="deleteOrderProduct(scope.data)">删 除</el-button>
+      </template>
+    </Table>
+    <!-- <el-table
       ref="multipleTable"
       :data="tableData"
       height="500px"
@@ -134,14 +211,6 @@
           <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
         </template>
       </el-table-column>
-      <!-- <el-table-column
-        prop="price"
-        label="价格"
-        width="90">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
-        </template>
-      </el-table-column> -->
       <el-table-column
         prop="marketprice"
         label="牌价"
@@ -231,7 +300,7 @@
           <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
         </template>
       </el-table-column>
-    </el-table>
+    </el-table> -->
     <div style="margin-top:16px;text-align:right">
       <el-pagination
         background
@@ -264,6 +333,7 @@
 /*import addProduct from '@/template/orderCanUseProduct/index.vue'*/
 import addProduct from '@/template/addProduct/index'
 import uploadAllData from '@/components/uploadAllData/index'
+import Table from '@/HDrpManagement/orderManage/details/tabs/table'
 export default {
   props:['data','type'],
   data () {
@@ -273,6 +343,7 @@ export default {
       setcol:24,
       dataRefresh:true,
       tableData:[],
+      tablecols:[],
       columnTitle:[],
       excelTitle:'订单明细',
       param:{
@@ -338,7 +409,8 @@ export default {
   components:{
     excel:() =>  import('../details/export_excel'),
     addProduct,
-    uploadAllData
+    uploadAllData,
+    Table
   },
   methods:{
     async listData () {
@@ -589,17 +661,18 @@ export default {
     this.listData()
     console.log("表结构")
     this.columnTitle  = []
-    this.$refs.multipleTable.$children.forEach(obj => {
-
+    setTimeout(() => {
+      this.$refs.multipleTable.$refs.table.$children.forEach(obj => {
       let columnChild = {'columnname':obj.prop,'filter':0,'rowindex':'','sequence':'','title':obj.label,'width':obj.width}
       // 存到columnTitle数组中
       this.columnTitle.push(columnChild)
-
     })
+    },1000)
     // console.log(this.columnTitle)
   },
   created() {
     this.tablecolsAdd = this.tool.tabelCol(this.$route.name).addProductTable.tablecols
+    this.tablecols = this.tool.tabelCol(this.$route.name).OrderListTable.tablecols
   },
   watch:{
     value2 (val) {

src/SDrpManagement/salerToolBorrowing/detail/index.vue

@@ -69,6 +69,7 @@ export default {
         }
       })
       this.mainData = res.data
+      console.log(this.mainData);
       this.changeDataStructure()
       this.orderreviewtype()
     },

src/SDrpManagement/salerToolBorrowing/modules/edit.vue

@@ -90,7 +90,7 @@
             </el-popover>
           </div>
           <div class="reveive__panel normal-margin">
-            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
+            <p><span class="inline-16"><b>{{defaultData.re_info.enterprisename}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
             <small>{{defaultData.re_info.province}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:'--'}}</small>
           </div>
         </div>
@@ -278,6 +278,9 @@ export default {
       this.defaultData.tradefieldmx = this.data.tradefieldmx
       this.defaultData.billdate = this.data.billdate
       this.defaultData.toolcount = this.data.toolcount
+
+      this.defaultData.re_info = this.data.pay_finance[0]
+
     },
     async queryAgentiInfo () {
       const res = await this.$api.requested({

src/SDrpManagement/toolBorrowing/modules/edit.vue

@@ -99,7 +99,7 @@
             </el-popover>
           </div>
           <div class="reveive__panel normal-margin">
-            <p><span class="inline-16"><b>{{defaultData.re_info.name}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
+            <p><span class="inline-16"><b>{{defaultData.re_info.enterprisename}}</b></span><small>{{defaultData.re_info.phonenumber}}</small></p>
             <small>{{defaultData.re_info.province}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:'--'}}</small>
           </div>
         </div>
@@ -304,6 +304,8 @@ export default {
       this.defaultData.tradefieldmx = this.data.tradefieldmx
       this.defaultData.billdate = this.data.billdate
       this.defaultData.toolcount = this.data.toolcount
+
+      this.defaultData.re_info = this.data.pay_finance[0]
     },
     async queryAgentiInfo () {
       const res = await this.$api.requested({

src/components/dynamic-table/index.vue

@@ -7,7 +7,7 @@
           type="selection"
           width="35" fixed v-if="checkbox">
       </el-table-column>
-      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?'right':false : false">
+      <el-table-column v-for="col in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="width && col.width === 0 ? 150 : col.width" :fixed="fixedName ? fixedName.indexOf(col.columnname)!= -1?redirect ? redirect : 'right' :false : false">
         <template slot-scope="scope">
           <div class="table-panel">
             <!-- 自定义表格显示内容 -->
@@ -32,7 +32,7 @@ export default {
     custom:是否启用自定义结构;
     opwidth:操作列宽度
   */
-  props:['layout','data','custom','height','fixedName','width','checkbox'],
+  props:['layout','data','custom','height','fixedName','width','checkbox','redirect'],
   data () {
     return {
       list:[],

src/router/HManagement.js

@@ -1,7 +1,7 @@
 import agentManage from '@/HManagement/marketing2/agent/index.vue'
 import agent_detail from '@/HManagement/marketing2/agent/details/index.vue'
 import EnterpriseArchives from '@/HManagement/EnterpriseArchives/index.vue'
-import EnterpriseArchivesDetail from '@/HManagement/EnterpriseArchives/index.vue'
+import EnterpriseArchivesDetail from '@/HManagement/EnterpriseArchives/modules/details.vue'
 const HManagement = [
   {
     path: '/archives_adlist',