2023-2-27

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -15,7 +15,11 @@
       </el-table-column> -->
       <el-table-column
         prop="rowno"
-        label="行号">
+        label="发货单行号">
+      </el-table-column>
+      <el-table-column
+        prop="orderRowno"
+        label="订单行号">
       </el-table-column>
       <el-table-column
         prop="itemno"

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTable.vue

@@ -61,8 +61,8 @@
             <upload class="inline-16" :folderid="folderid" :bindData="{ownertable: 'sa_invoicebill', ownerid: scope.row.sa_invoicebillid,usetype: 'default'}" @onSuccess="listData" btntype="icon"></upload>
             <a class="table_row_link inline-16" v-if="scope.row.attinfos.length > 0" :href="scope.row.attinfos[scope.row.attinfos.length - 1].url">下载发票</a>
           </div>
-          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" @click="editRow(scope.row)" type="text" size="mini" :disabled="data.status !== '新建'">编 辑</el-button>
-          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" @click="deleteRow(scope.row)" type="text" size="mini" :disabled="data.status !== '新建'">删 除</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" @click="editRow(scope.row)" type="text" size="mini" :disabled="data.status !== '新建' && data.status !== '提交'">编 辑</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" @click="deleteRow(scope.row)" type="text" size="mini" :disabled="data.status !== '新建' && data.status !== '提交'">删 除</el-button>
         </template>
       </el-table-column>
     </el-table>

src/HDrpManagement/invoiceapp/detail/tab/blueInvoice/components/invoiceTablemx.vue

@@ -46,7 +46,7 @@
       <el-table-column label="操作" width="90" fixed="right">
         <template slot-scope="scope">
           <editmx class="inline-16" :status="status" :sa_invoicebillid="param.content.sa_invoicebillid" :data="scope.row" @onSuccess="onSuccess"></editmx>
-          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status !== '新建'" size="small" type="text" @click="deleteRow(scope.row)">删 除</el-button>
+          <el-button v-if="tool.checkAuth($route.name,'editBlueInvioce')" :disabled="status !== '新建' && status !== '提交'" size="small" type="text" @click="deleteRow(scope.row)">删 除</el-button>
         </template>
       </el-table-column>
     </el-table>

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

@@ -20,6 +20,13 @@
       <el-descriptions-item label="联系人">{{ mainData.contacts?mainData.contacts.name:"--" }}</el-descriptions-item>
       <el-descriptions-item label="联系电话">{{ mainData.contacts?mainData.contacts.phonenumber:"--" }}</el-descriptions-item>
       <el-descriptions-item label="地址">{{ mainData.contacts?`${mainData.contacts.province?mainData.contacts.province:''}${mainData.contacts.city?mainData.contacts.city:''}${mainData.contacts.county?mainData.contacts.county:''}${mainData.contacts.address?mainData.contacts.address:''}`:'--'}}</el-descriptions-item>
+      <el-descriptions-item label="创建人">{{ mainData.createby?mainData.createby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="创建时间">{{ mainData.createdate?mainData.createdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="提交人">{{ mainData.submitby?mainData.submitby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="提交时间">{{ mainData.submitdate?mainData.submitdate:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="审核人">{{ mainData.checkby?mainData.checkby:"--" }}</el-descriptions-item>
+      <el-descriptions-item label="审核时间">{{ mainData.checkdate?mainData.checkdate:"--" }}</el-descriptions-item>
+
     </el-descriptions>
 <!--    <el-descriptions  border :column="2" labelClassName="my-label" contentClassName="my-content">
       <div slot="title" class="my-label__title">物流信息</div>

src/HDrpManagement/serveBill/components/add.vue

@@ -178,7 +178,11 @@ export default {
       agentParam: {
         "id":20221216145803,
         "content": {
-
+          "pageNumber":1,
+          "pageSize":20,
+          "where": {
+            condition:''
+          }
         }
       }
     }

src/HDrpManagement/serveBill/components/edit.vue

@@ -125,7 +125,7 @@
 </template>
 
 <script>
-import selectAgent from '@/template/selectAgent/index'
+import selectAgent from './selectAgent'
 import selectOrder from './selectOrder'
 import { log } from '@antv/g2plot/lib/utils'
 

src/HDrpManagement/serveBill/components/selectAgent.vue

@@ -0,0 +1,112 @@
+<template>
+  <div> 
+    <el-dialog :visible.sync="visible" append-to-body width="50%">
+      <div class="flex-align-center flex-between mt-10">
+        <el-input 
+          style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+      </div>
+      <div>
+        <el-table
+          ref="multipleTable"
+          :data="tableData"
+          style="width: 100%"
+          size="mini"
+          height="50vh"
+          border>
+          <el-table-column
+            prop="enterprisename"
+            :label="qiyi ? '企业名称' : '经销商名称'"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="agentnum"
+            :label="qiyi ? '编号' : '经销商编号'"
+            width="180">
+          </el-table-column>
+          <el-table-column
+            prop="contact"
+            label="联系人">
+          </el-table-column>
+          <el-table-column
+            label="地址">
+            <template slot-scope="scope">
+              {{scope.row.province}}{{scope.row.city}}{{scope.row.county}}{{scope.row.address}}
+            </template>
+          </el-table-column>
+          <el-table-column
+            label="操作">
+            <template slot-scope="scope">
+              <el-button type="text" size="small" @click="selectRow(scope.row)">选 择</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="margin-top:16px;text-align:right">
+          <el-pagination
+            background
+            small
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange"
+            :current-page="currentPage"
+            :page-size="param.content.pageSize"
+            layout="total, prev, pager, next, jumper"
+            :total="total">
+          </el-pagination>
+        </div>
+      </div>
+    </el-dialog>
+    <slot name="input"></slot>
+  </div>
+</template>
+
+<script>
+export default {
+  props:['customParam','qiyi'],
+  data () {
+    return {
+      visible:false,
+      param:{
+        "id":20221216145803,
+        "content": {
+          "pageNumber":1,
+          "pageSize":20,
+          where: {
+            condition:''
+          }
+        }
+      },
+      tableData: [],
+      total:0,
+      currentPage:0
+    }
+  },
+  methods:{
+    async listData () {
+      const res = await this.$api.requested(this.customParam ? this.customParam : this.param)
+      this.tableData = res.data
+      this.total = res.total
+      this.currentPage = res.pageNumber
+      console.log(this.tableData);
+      
+    },
+    handleSizeChange(val) {
+      // console.log(`每页 ${val} 条`);
+      this.param.content.pageSize = val
+      this.listData()
+    },
+    handleCurrentChange(val) {
+      // console.log(`当前页: ${val}`);
+      this.param.content.pageNumber = val
+      this.listData()
+    },
+    selectRow (row) {
+      this.$emit('selectRow',row)
+    }
+  },
+  created () {
+    this.listData()
+  },
+}
+
+</script>
+<style>
+</style>

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -33,6 +33,11 @@ export default {
       class_act:''
     }
   },
+  provide () {
+    return {
+      selectThis:() => this
+    }
+  },
   props: {
     default: {
       type: Boolean,
@@ -90,20 +95,18 @@ export default {
     clickClass (item) {
       if (item) {
         this.activeClass = item
-        console.log(item);
-        
         this.class_act = item.itemclassnum
-        this.change(item)
+        this.$emit('onClassChange',item)
       } else {
         this.class_act = ''
         this.$emit('onClassChange',item)
       }
-      console.log(this.class_act);
+      console.log('分类单机出发');
       
       
     },
     change(n) {
-      console.log(n)
+      console.log('分类单机出发2');
       this.$emit('onClassChange',n)
     },
     clearSearch() {

src/SDrpManagement/ProductGroup/modules/classTree.vue

@@ -1,10 +1,10 @@
 <template>
   <div>
     <div class="flex-start">
-      <div v-for="item in data" :key="item.index" @click="classClick(item)">
+      <div v-for="item in data" :key="item.index" @click.stop="classClick(item)">
         <p class="classItem" v-if="item.index === 1"  :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
         <p class="classItem"  v-else   :class="class_act === item.itemclassnum?'act':''">{{item.itemclassname}}</p>
-        <Tree v-if="item.subdep && class_act === item.itemclassnum" :data="item.subdep" @onClassChange="change"></Tree>
+        <Tree v-if="item.subdep && class_act === item.itemclassnum" :data="item.subdep"></Tree>
       </div>
     </div>
   </div>
@@ -14,6 +14,7 @@
 export default {
   name: "Tree",
   props:['data'],
+  inject:['selectThis'],
   data () {
     return {
       activeClass:{},
@@ -25,11 +26,8 @@ export default {
       console.log(item)
       this.activeClass = item
       this.class_act = item.itemclassnum
-      this.change(item)
+      this.selectThis().change(item)
     },
-    change(item) {
-      this.$emit('onClassChange',item)
-    }
   }
 }
 </script>

src/template/selectAgent/index.vue

@@ -2,7 +2,15 @@
   <div> 
     <el-dialog :visible.sync="visible" append-to-body width="50%">
       <div class="flex-align-center flex-between mt-10">
-        <el-input style="width:200px" size="small"  suffix-icon="el-icon-search" v-model="param.content.where.condition" placeholder="搜索" @keyup.enter.native="listData(param.content.pageNumber = 1)" @clear="listData(param.content.pageNumber = 1)" clearable></el-input>
+        <el-input 
+          style="width:200px" 
+          size="small"  
+          suffix-icon="el-icon-search" 
+          placeholder="搜索" 
+          @input="valueChange"
+          v-model="condition"
+          @keyup.enter.native="listData(customParam ? customParam.content.pageNumber = 1 : param.content.pageNumber = 1)" 
+          @clear="listData(customParam ? customParam.content.pageNumber = 1 : param.content.pageNumber = 1)" clearable></el-input>
       </div>
       <div>
         <el-table
@@ -58,6 +66,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   props:['customParam','qiyi'],
   data () {
@@ -76,6 +85,7 @@ export default {
       },
       tableData: [],
       total:0,
+      condition:'',
       currentPage:0
     }
   },
@@ -88,6 +98,14 @@ export default {
       console.log(this.tableData);
       
     },
+    valueChange (data) {
+      console.log(data);
+      if (this.customParam) {
+        this.customParam.content.where.condition = data
+      } else {
+        this.param.content.where.condition = data
+      }
+    },
     handleSizeChange(val) {
       // console.log(`每页 ${val} 条`);
       this.param.content.pageSize = val