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

src/Form/productMoneyOdd/add.vue

@@ -56,8 +56,8 @@ export default {
           this.$refs['form'].resetFields();
           this.dialogFormVisible = false
           console.log(res.data,'商品调价单')
-          /*this.$store.dispatch('changeDetailDrawer',true)
-          this.$router.push({path:'/productMoneyOddDetail',query:{id:res.data.sa_itempriceadjustid,rowindex:res.data.rowindex}})*/
+          this.$store.dispatch('changeDetailDrawer',true)
+          this.$router.push({path:'/productMoneyOddDetail',query:{id:res.data[0].sa_itempriceadjustid,rowindex:res.data[0].rowindex}})
         })
       })
     },

src/Form/productMoneyOdd/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button size="mini" @click="editBtn">编 辑</el-button>
+    <el-button size="mini" type="primary" @click="editBtn">编 辑</el-button>
     <el-dialog title="新 建" append-to-body :visible.sync="dialogFormVisible" width="30%">
       <div slot="title" style="font-size: 15px">
         新增价格调整单

src/HDrpManagement/afterSalesmag/components/add.vue

@@ -84,7 +84,7 @@ export default {
         enterprisename:[
           { required: true, message: '请选择经销商', trigger: 'change'},
         ],
-        sa_orderid:[
+        sonum:[
           { required: true, message: '请选择订单', trigger: 'change'}
         ],
         billdate:[

src/HDrpManagement/bankStatement/components/confirm.vue

@@ -29,12 +29,10 @@
         </el-table-column>
          <el-table-column
           prop="contact"
-          label="联系人"
-          width="90">
+          label="联系人">
         </el-table-column>
         <el-table-column
-          label="地址"
-          width="180">
+          label="地址">
           <template slot-scope="scope">
             {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
           </template>

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

@@ -139,24 +139,42 @@
             <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
           </template>
         </el-table-column>
+        <el-table-column
+          prop="marketprice"
+          label="牌价"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="defaultprice"
+          label="折前价格"
+          width="100">
+        </el-table-column>
+        <el-table-column
+          prop="defaultamount"
+          label="折前金额"
+          width="100">
+          <template slot-scope="scope">
+            <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice * scope.row.qty,2)}}</p>
+          </template>
+        </el-table-column>
         <el-table-column
           prop="price"
-          label="价格"
+          label="折后价格"
           width="100">
           <template slot-scope="scope">
             <el-input v-if="data.status === '新建' && data.type === '特殊订单'" v-model.number="scope.row.price" @input="onInput(scope.row,scope.$index)" placeholder="输入订单备注" size="mini" @change="rowChange(scope.row,scope.$index)"></el-input>
-            <p v-else style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
+            <p v-else>¥&nbsp;{{tool.formatAmount(scope.row.price,2)}}</p>
           </template>
         </el-table-column>
-        <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> -->
         <el-table-column
-          label="小计"
+          label="折后金额"
           prop="totalprice">
           <template slot-scope="scope">
             <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>

src/HDrpManagement/prodectFileData/components/relationList.vue

@@ -75,7 +75,9 @@ export default {
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total
-      this.currentPage = res.pageTotal
+      this.currentPage = res.pageNumber
+      console.log(this.currentPage);
+      
       console.log(res)
     },
     handleSizeChange(val) {

src/HDrpManagement/productMoneyOdd/components/Del.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16">
     <el-popconfirm title="确定删除当前价格调整单吗？" @confirm="deleteRow()">
-      <el-button slot="reference" size="mini" :disabled="isEdit()">删 除</el-button>
+      <el-button type="primary" slot="reference" size="mini" :disabled="isEdit()">删 除</el-button>
     </el-popconfirm>
   </div>
 </template>

src/HDrpManagement/productMoneyOdd/components/check.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="inline-16">
     <el-popconfirm title="确定通过审核吗？" @confirm="CheckRow()">
-      <el-button slot="reference" :disabled="isEdit()" size="mini">审 核</el-button>
+      <el-button type="primary" slot="reference" :disabled="isEdit()" size="mini">审 核</el-button>
     </el-popconfirm>
   </div>
 </template>

src/HDrpManagement/toolBorrowingMag/detail/index.vue

@@ -11,7 +11,7 @@
       ownertable="sa_order"
       delApiId="20230116100002"
       :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'交期待确认'},{key:'status',value:'提交'},{key:'status',value:'交期确认'}]"
-      :tabs="['借用单明细']"
+      :tabs="['借用单明细','发货单','物流单','收支明细']"
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" class="inline-16">
@@ -45,7 +45,14 @@
       <div slot="slot0" >
         <toolList></toolList>
       </div>
-      <div slot="slot1" >
+       <div slot="slot1">
+        <dispatch></dispatch>
+      </div>
+      <div slot="slot2">
+        <logistics></logistics>
+      </div>
+      <div slot="slot3">
+        <revenue :data="mainData"></revenue>
       </div>
     </basicDetails>
     <el-dialog append-to-body title="退回原因" :visible.sync="dialogVisible" width="400px">
@@ -61,6 +68,9 @@
 <script>
 import toolList from './tabs/toolList.vue'
 import confirmDate from '../modules/confirmDate.vue'
+import dispatch from './tabs/dispatch.vue'
+import logistics from './tabs/logistics.vue'
+import revenue from './tabs/revenueAndExp.vue'
 
 export default {
   name: "detail",
@@ -77,7 +87,10 @@ export default {
   },
   components:{
     toolList,
-    confirmDate
+    confirmDate,
+    dispatch,
+    logistics,
+    revenue,
   },
   methods:{
     async orderreviewtype () {
@@ -93,6 +106,8 @@ export default {
         }
       })
       this.mainData = res.data
+      console.log(this.mainData);
+      
       this.changeDataStructure()
       this.orderreviewtype()
     },

src/HDrpManagement/toolBorrowingMag/detail/tabs/dispatch.vue

@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      size="small"
+      border>
+      <el-table-column
+        prop="billno"
+        label="发货单号"
+        width="180">
+        <template slot-scope="scope">
+          <a class="table_row_link" @click="linkDetail(scope.row)">{{scope.row.billno}}</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="billdate"
+        label="发货日期">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="备注">
+      </el-table-column>
+    </el-table>
+    <div class="container normal-panel" style="text-align:right">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-sizes="[20, 50, 100, 200]"
+        layout="total,sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      tableData:[],
+      param:{
+        "id": 20221205111302,
+        "content": {
+          "sa_orderid": '',
+          "pageNumber": 1,
+          "pageSize": 17,
+          "where": {
+            "condition": ""
+          }
+        },
+      },
+      total:0,
+      currentPage:0,
+    }
+  },
+  methods:{
+    async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      this.param.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      this.param.pageNumber = val
+      this.listData()
+    },
+    linkDetail (item) {
+        let route = this.$route
+        if (route.path !== '/taskDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({path:'/dispatchdetail',query:{id:item.sa_dispatchid,rowindex:item.rowindex}})
+      }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/toolBorrowingMag/detail/tabs/logistics.vue

@@ -0,0 +1,96 @@
+<template>
+  <div>
+    <el-table
+      :data="tableData"
+      style="width: 100%"
+      size="small"
+      border>
+      <el-table-column
+        prop="billno"
+        label="物流单号"
+        width="180">
+        <template slot-scope="scope">
+          <a class="table_row_link" @click="linkDetail(scope.row)">{{scope.row.billno}}</a>
+        </template>
+      </el-table-column>
+      <el-table-column
+        prop="status"
+        label="状态"
+        width="90">
+      </el-table-column>
+      <el-table-column
+        prop="createdate"
+        label="单据日期">
+      </el-table-column>
+      <el-table-column
+        prop="address"
+        label="备注">
+      </el-table-column>
+    </el-table>
+    <div class="container normal-panel" style="text-align:right">
+      <el-pagination
+        background
+        @size-change="handleSizeChange"
+        @current-change="handleCurrentChange"
+        :current-page="currentPage"
+        :page-sizes="[20, 50, 100, 200]"
+        layout="total,sizes, prev, pager, next, jumper"
+        :total="total">
+      </el-pagination>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data () {
+    return {
+      tableData:[],
+      param:{
+        "id": 20221205111402,
+        "content": {
+          "sa_orderid": '',
+          "pageNumber": 1,
+          "pageSize": 17,
+          "where": {
+            "condition": ""
+          }
+        },
+      },
+      total:0,
+      currentPage:0,
+    }
+  },
+  methods:{
+    async listData() {
+      this.param.content.sa_orderid = this.$route.query.id
+      const res = await this.$api.requested(this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      this.param.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      this.param.pageNumber = val
+      this.listData()
+    },
+    linkDetail (item) {
+        let route = this.$route
+        if (route.path !== '/taskDetails') {
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+        }
+        this.$router.replace({path:'/logisticsdetail',query:{id:item.sa_logisticsid,rowindex:item.rowindex}})
+      }
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/toolBorrowingMag/detail/tabs/revenueAndExp.vue

@@ -0,0 +1,70 @@
+<template>
+  <div>
+    <el-table
+      :data="list"
+      style="width: 100%"
+      size="mini"
+      border>
+      <el-table-column
+        prop="billno"
+        label="单据编号"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="source"
+        label="来源"
+        width="180">
+      </el-table-column>
+      <el-table-column
+        prop="amount"
+        label="金额">
+      </el-table-column>
+      <el-table-column
+        prop="remarks"
+        label="备注">
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['data'],
+  data () {
+    return {
+      list:[],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested({
+        "id": 20230221193203,
+        "content": {
+          "sa_orderid":this.data.sa_orderid
+        }
+      })
+      this.list = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.params.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.params.content.pageNumber = val
+      this.listData()
+    },
+  },
+  mounted () {
+    this.listData()
+  }
+}
+
+</script>
+<style>
+</style>

src/HDrpManagement/toolBorrowingMag/modules/edit.vue

@@ -288,7 +288,7 @@ export default {
         }
       })
       this.receiveAddresslist = res.data
-      this.defaultData.re_info = res.data[0]
+      this.defaultData.re_info = res.data[0] ? res.data[0] : {}
     },
 
     // 账号信息

src/HManagement/archvies_mag/modules/edit.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-dialog title="编辑文件夹" :visible.sync="dialogFolderVisible">
+    <el-dialog append-to-body title="编辑文件夹" :visible.sync="dialogFolderVisible">
       <div class="flex-align-center container">
         <p style="width:100px">文件夹名称</p>
         <el-input readonly size="small" v-model="folder.document"></el-input>

src/HManagement/archvies_mag/modules/list.vue

@@ -195,6 +195,7 @@ export default {
   margin-bottom: 15px;
   cursor: pointer;
   font-size: 14px;
+  margin: 0 !important;
   /* min-height: 110px; */
 }
 

src/HManagement/archvies_mag/modules/modifyLocation.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-dialog title="移动到" :visible.sync="dialogTreeVisible" width="500px">
+  <el-dialog append-to-body title="移动到" :visible.sync="dialogTreeVisible" width="500px">
     <div class="border">
       <el-tree :data="data" :props="defaultProps" @node-click="handleNodeClick" :load="loadNode" lazy highlight-current accordion>
         <div :class="data.class" slot-scope="{ node, data }">

src/HManagement/archvies_mag/modules/moreOperation.vue

@@ -10,7 +10,7 @@
       <el-dropdown-item @click.native="showFileTree">移动到</el-dropdown-item>
     </el-dropdown-menu>
     <modifyLocation ref="modefy" :checklist="checklist" @onChangeFolderModify="onChangeFolderModify"></modifyLocation>
-    <el-dialog title="分享" :visible.sync="urlDialog" width="500px">
+    <el-dialog append-to-body title="分享" :visible.sync="urlDialog" width="500px">
       <div class="border">
       <el-input placeholder="链接地址" v-model="checklist[0].url">
         <el-button slot="append" @click="test">复制</el-button>

src/HManagement/marketing2/agent/details/modules/saleclass/index.vue

@@ -16,7 +16,7 @@ export default {
   props:['data','detail'],
   data() {
     return {
-      saleClassList:'',
+      saleClassList:[],
       tablecols:[],
       param:{}
     };

src/HManagement/marketing2/agent/details/modules/saleclass/modules/addSaleClass.vue

@@ -14,15 +14,15 @@
 </template>
 
 <script>
-import { log } from '@antv/g2plot/lib/utils';
 export default {
   props: ['data'],
   data () {
     return {
       dialogVisible: false,
       deplist:[],
-      result:'',
-      selectArr:[]
+      result:[],
+      selectArr:[],
+      brandids:[]
     }
   },
   created() {
@@ -77,7 +77,7 @@ export default {
           itemclassnum: node['itemclassnum'],
           children: []
         }
-        if(elNode.sa_brandid) elNode.disabled = true
+        // if(elNode.sa_brandid) elNode.disabled = true
         if (node.subdep && node.subdep.length > 0) {
           // 如果存在子节点
           for (var index = 0; index < node.subdep.length; index++) {
@@ -96,15 +96,13 @@ export default {
       return arr
     },
     async submit() {
-      console.log(this.selectArr.length)
-      console.log(this.sys_enterpriseid)
-      console.log(this.data)
       if(this.selectArr.length == 0) return
       let res = await this.$api.requested({
           "id": 20220924134302,
           "content": {
               "sys_enterpriseid": this.data.sys_enterpriseid, //企业id
-              "itemclassid":this.result
+              "itemclassid":this.result,
+              "sa_brandids":this.brandids
           },
       })
       console.log(res);
@@ -115,16 +113,22 @@ export default {
       })
     },
     change(data) {
-      let temp = JSON.parse(JSON.stringify(data))
-      temp.forEach(item => {
-        item.shift()
-      })    
-      let temp2 = []
-      temp.forEach(item => {
-        temp2.push(...item)
-      })    
-      temp2 = [...new Set(temp2)]
-      this.result = temp2
+      let node = this.$refs['select'].getCheckedNodes()
+      this.brandids = node.filter(e=>{
+        if (!e.parent) {
+          return e
+        }
+      }).map(e=>{
+        return e.data.sa_brandid
+      })
+
+      this.result = node.filter(e=>{
+        if (e.parent) {
+          return e
+        }
+      }).map(e=>{
+        return e.data.itemclassid
+      })
     }
   }
 }

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -93,6 +93,8 @@ export default {
     clickClass (item) {
       if (item) {
         this.activeClass = item
+        console.log(item);
+        
         this.class_act = item.itemclassnum
         this.change(item)
       } else {

src/SDrpManagement/agentOrder/modules/productlist.vue

@@ -45,34 +45,36 @@
           <span v-else>{{scope.row.qty}}</span>
         </template>
       </el-table-column>
-      
+      <el-table-column
+        prop="marketprice"
+        label="牌价"
+        width="100">
+      </el-table-column>
       <el-table-column
         prop="defaultprice"
-        label="单价"
-        width="90">
-        <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice,2)}}</p>
-        </template>
+        label="折前价格"
+        width="100">
       </el-table-column>
-        <el-table-column
-        label="金额"
-        width="150">
+      <el-table-column
+        prop="defaultamount"
+        label="折前金额"
+        width="100">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.defaultamount}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice * scope.row.qty,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column
         label="折后单价"
         prop="price">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.price}}</p>
+          <p>¥&nbsp;{{scope.row.price}}</p>
         </template>
       </el-table-column>
       <el-table-column
         label="折后金额"
         width="150">
         <template slot-scope="scope">
-          <p style="color:red;font-weight:500">¥&nbsp;{{scope.row.amount}}</p>
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>
         </template>
       </el-table-column>
       <el-table-column

src/SDrpManagement/salerOrder/modules/productlist.vue

@@ -97,23 +97,41 @@
           <el-tag size="mini" type="info" effect="plain">{{scope.row.unit}}</el-tag>
         </template>
       </el-table-column>
-      <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="牌价"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="defaultprice"
+        label="折前价格"
+        width="100">
+      </el-table-column>
+      <el-table-column
+        prop="defaultamount"
+        label="折前金额"
+        width="100">
+        <template slot-scope="scope">
+          <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.defaultprice * scope.row.qty,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>
+          <p>¥&nbsp;{{scope.row.price}}</p>
         </template>
       </el-table-column>
       <el-table-column
-        label="小计"
+        label="折后金额"
         width="150">
         <template slot-scope="scope">
           <p style="color:red;font-weight:500">¥&nbsp;{{tool.formatAmount(scope.row.price * scope.row.qty,2)}}</p>