2023-2-20

src/HDrpManagement/logistics/details/index.vue

@@ -3,7 +3,6 @@
       <basicDetails
           ref="details"
           :titleText="`${mainData.billno}`"
-          :oldFormPath="{edit:'HDrpManagement/logistics/modules'}"
           :editData="mainData"
           :mainAreaData="mainAreaData"
           turnPageId="20221122132804"
@@ -17,6 +16,7 @@
         <div slot="tags">
         </div>
         <div slot="customOperation" >
+          <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="queryMainData(),$refs.dispatch.listData()"/>
           <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status !== '收货'" @click="onConfimRec">确认收货</el-button>
           <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status !== '收货'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
         </div>
@@ -24,7 +24,7 @@
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>
         </div>
         <div slot="slot1" >
-          <dispatchTable @rowClick="rowClick" :needQuery="true"></dispatchTable>
+          <dispatchTable ref="dispatch" @onInit="onInit" @rowClick="rowClick" :needQuery="true"></dispatchTable>
           <dismx ref="dismx"></dismx>
         </div>
         <div  slot="slot2">
@@ -40,6 +40,7 @@
 </template>
   
   <script>
+  import Edit from '../modules/edit'
   import defalutInfo from '../modules/defaultInfo.vue'
   import dispatchTable from '../modules/dispatchTable.vue'
   import dismx from '../modules/productlist.vue'
@@ -60,7 +61,8 @@
       dismx,
       addBox,
       boxlist,
-      courierRecords
+      courierRecords,
+      Edit
     },
     methods:{
       async queryMainData(id) {
@@ -103,6 +105,11 @@
             label:'运费',
             value:this.mainData.freightamount
           },
+          {
+            label:'寄件方式',
+            value:this.mainData.paytype
+          },
+          
 
           {
             label:'状态',
@@ -197,6 +204,9 @@
       },
       onBoxSuccess () {
         this.$refs['boxlist'].listData()
+      },
+      onInit (data) {
+        this.$refs.dismx.listData(data.sa_dispatchid)
       }
     },
     mounted () {

src/HDrpManagement/logistics/modules/add.vue

@@ -47,7 +47,7 @@
         <el-form-item label="备注">
           <el-input v-model.number="form.remarks" placeholder="运费"></el-input>
         </el-form-item>
-        <el-form-item label="单据日期">
+        <el-form-item label="单据日期" prop="billdate">
           <el-date-picker
             v-model="form.billdate"
             type="date"
@@ -67,33 +67,16 @@
             <dispatch-table ref="dislist"></dispatch-table>
           </el-col>
           <el-col :span="24 - setcol">
-            <add-disbill ref="addbill" :data="enterpriseInfo" :paytype="form.paytype" @onConfirm="onConfirm"></add-disbill>
+            <add-disbill v-if="drawer" ref="addbill" :data="enterpriseInfo" :paytype="form.paytype" @onConfirm="onConfirm"></add-disbill>
           </el-col>
         </el-row>
       </div>
     </div>
     <div class="fixed__btn__panel">
       <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
-      <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">保存修改</el-button>
+      <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">提交</el-button>
     </div>
     </el-drawer>
-    <el-dialog append-to-body title="选择收货地址" :visible.sync="dialogAddress">
-      <p style="color:red" class="mt-10">存在多个收货地址，请选择正确收货地址！</p>
-      <el-table :data="rec_address">
-        <el-table-column property="name" label="收货人" width="150"></el-table-column>
-        <el-table-column property="phonenumber" label="联系电话" width="200"></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>
-          <template slot-scope="scope">
-            <el-button type="text" @click="selectAddress(scope.row)" size="small">选 择</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
   </div>
 </template>
 <script>
@@ -112,7 +95,6 @@ export default {
     return {
       drawer:false,
       visible:false,
-      dialogAddress:false,
       setcol:24,
       form:{
         "freightamount": "",
@@ -127,7 +109,7 @@ export default {
         "logisphone":"",
         "logiscontact":"",
         "rec_contactsid":'',
-        billdate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDay()}`
+        billdate:`${new Date().getFullYear()}-${new Date().getMonth() + 1}-${new Date().getDate()}`
       },
       rules:{
         point:[
@@ -135,7 +117,6 @@ export default {
         ],
       },
       enterpriseInfo:null,
-      rec_address:[],
       pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 24 * 3600 * 1000;
@@ -176,23 +157,13 @@ export default {
         "content": this.form
       })
       console.log(res);
-      
-      if (Array.isArray(res.data)) {
-        this.dialogAddress = true
-        this.rec_address = res.data
-      } else {
-        this.tool.showMessage(res,()=>{
-          this.drawer = false
-          this.dialogAddress = false
-          this.$emit('onSuccess')
-          this.form = {}
-        })
-      }
-      this.$router.push({path:'/logisticsdetail',query:{id:res.data.sa_logisticsid,rowindex:res.data.rowindex}})
-    },
-    selectAddress (row) {
-      this.form.rec_contactsid = row.rec_contactsid
-      this.onSubmit()
+      this.tool.showMessage(res,()=>{
+        this.drawer = false
+        this.dialogAddress = false
+        this.$emit('onSuccess')
+        this.form = {}
+        this.$router.push({path:'/logisticsdetail',query:{id:res.data.sa_logisticsid,rowindex:res.data.rowindex}})
+      })
     },
     selectChange () {
       this.$refs['addbill'].listData()

src/HDrpManagement/logistics/modules/dispatchTable.vue

@@ -98,6 +98,7 @@
             }
           }
         })
+        if(res.data.length > 0) this.$emit('onInit',res.data[0]);
         this.tableData = res.data
         res.data.length > 0?this.rowClick(res.data[0]):''
       },

src/HDrpManagement/logistics/modules/edit.vue

@@ -75,10 +75,10 @@ ed<template>
     </div>
     <div class="fixed__btn__panel">
       <el-button size="small" @click="drawer = false" class="normal-btn-width">取 消</el-button>
-      <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">保存修改</el-button>
+      <el-button size="small" type="primary" @click="onSubmit" class="normal-btn-width">确定</el-button>
     </div>
     </el-drawer>
-    <el-dialog append-to-body title="选择收货地址" :visible.sync="dialogAddress">
+    <!-- <el-dialog append-to-body title="选择收货地址" :visible.sync="dialogAddress">
       <p style="color:red" class="mt-10">存在多个收货地址，请选择正确收货地址！</p>
       <el-table :data="rec_address">
         <el-table-column property="name" label="收货人" width="150"></el-table-column>
@@ -94,7 +94,7 @@ ed<template>
           </template>
         </el-table-column>
       </el-table>
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 <script>
@@ -114,7 +114,6 @@ export default {
     return {
       drawer:false,
       visible:false,
-      dialogAddress:false,
       setcol:24,
       form:{
        "freightamount": "",
@@ -129,10 +128,9 @@ export default {
         "logisphone":"",
         "logiscontact":"",
         "rec_contactsid":'',
-        billdate:new Date()
+        billdate:''
       },
       enterpriseInfo:null,
-      rec_address:[],
        pickerOptions: {
         disabledDate(time) {
           return time.getTime() < Date.now() - 24 * 3600 * 1000;
@@ -151,7 +149,6 @@ export default {
      
     },
     addMoreBill () {
-      console.log(this.data)
       if (this.enterpriseInfo === null) return this.$message({
         message:'请先选择企业信息',
         type:'error'
@@ -182,22 +179,11 @@ export default {
         "id": "202212004124804",
         "content": this.form
       })
-      if (Array.isArray(res.data)) {
-        this.dialogAddress = true
-        this.rec_address = res.data
+      this.tool.showMessage(res,()=>{
+        this.drawer = false
         this.$emit('onSuccess')
-      } else {
-        this.tool.showMessage(res,()=>{
-          this.drawer = false
-          this.dialogAddress = false
-          this.$emit('onSuccess')
-          this.form = {}
-        })
-      }
-    },
-    selectAddress (row) {
-      this.form.rec_contactsid = row.rec_contactsid
-      this.onSubmit()
+        this.form = {}
+      })
     },
     onClose () {
       this.$refs['ent'].form = this.$refs['logis'].form = {}

src/HManagement/siteManage/systemRemind/components/edit.vue

@@ -9,7 +9,7 @@
         <el-form :model="form" :rules="rules" ref="form" label-width="90px" label-position="right" size="mini">
           <el-col :span="12">
             <el-form-item label="提醒名称" prop="remindname">
-              <el-input v-model="form.remindname" placeholder="提醒名称"></el-input>
+              <el-input disabled v-model="form.remindname" placeholder="提醒名称"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -28,7 +28,7 @@
           </el-col>
           <el-col :span="24">
             <el-form-item label="提醒内容" prop="content">
-              <el-input type="textarea" v-model="form.content" placeholder="提醒内容"></el-input>
+              <el-input type="textarea" v-model="form.content" placeholder="输入提醒内容,绑定表字段调用方式为 冒号+字段名，如 :createuserid，SQL语句的插入方式为大括号中加入SQL语句，如 {select name from sys_users where userid=:createuserid}"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -113,11 +113,10 @@ export default {
       this.form.remindmode = JSON.parse(this.data.remindmode)
     },
     onSubmit(){
-      return console.log()
       this.$refs['form'].validate(async (valid) => {
         if (!valid) return false
         const res = await this.$api.requested({
-          "id": "20221008134703",
+          "id": "20221220153201",
           "version":1,
           "content": this.form
         })

src/HManagement/siteManage/systemRemind/index.vue

@@ -7,7 +7,7 @@
         add:'HManagement/siteManage/systemRemind/components'
       }"
       tableName="systemRemindTable" 
-      idName="userid" 
+      idName="sys_remind_configid" 
       :apiId="{query:20221220153101,del:''}"
       :options="options">
       <div slot="custom"></div>
@@ -17,7 +17,7 @@
         </div>
       </template>
       <template v-slot:tbOpreation="scope">
-        <Edit :data="scope.data.data"/>
+        <Edit @onSuccess="$refs.basicLayout.listData()" :data="scope.data.data"/>
       </template>
     </basicLayout>
   </div>

src/SDrpManagement/ProductGroup/modules/Select.vue

@@ -2,15 +2,15 @@
   <div class="border-bottom">
     <div>
       <ul class="flex-align-center normal-margin">
-        <li style="color:#999;font-size: 13px;">领域:</li>
+        <li :class="field_act === ''?'act':''" class="brand-item" @click="clickField('')">全部领域</li>
         <li :class="field_act === item.sys_enterprise_tradefieldid?'act':''" class="brand-item" v-for="item in fields" :key="item.sys_enterprise_tradefieldid" @click="clickField(item)">{{item.tradefield}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li style="color:#999;font-size: 13px;">品牌:</li>
+        <li :class="brand_act === ''?'act':''" class="brand-item" @click="clickBrand('')">全部品牌</li>
         <li :class="brand_act === item.sa_brandid?'act':''" class="brand-item" v-for="item in brands" :key="item.sa_brandid" @click="clickBrand(item.sa_brandid)">{{item.brandname}}</li>
       </ul>
       <ul class="flex-align-center normal-margin">
-        <li style="color:#999;font-size: 13px;">分类:</li>
+        <li :class="class_act === ''?'act':''" class="brand-item" @click="clickClass('')">全部分类</li>
         <li :class="class_act === item.itemclassnum?'act':''" class="brand-item" v-for="item in itemclass" :key="item.itemclassnum" @click="clickClass(item)">{{item.itemclassname}}</li>
       </ul>
       <classTree style="padding-left:31px" :data="activeClass.subdep" @onClassChange="change"></classTree>
@@ -31,9 +31,9 @@ export default {
       fields:[],
       itemclass:[],
       activeClass:{},
-      field_act:0,
-      brand_act:0,
-      class_act:0
+      field_act:'',
+      brand_act:'',
+      class_act:''
     }
   },
   props: {
@@ -58,7 +58,7 @@ export default {
         }
       })
       this.fields = res1.data
-      this.field_act = res1.data[0].sys_enterprise_tradefieldid
+      this.field_act = ''
     },
     async queryBrands () {
       const res = await this.$api.requested({
@@ -71,8 +71,7 @@ export default {
         }
       })
       this.brands = res.data
-      this.brand_act = this.brands[0].sa_brandid
-      this.queryClass()
+      this.brand_act = ''
     },
 
     async queryClass () {
@@ -87,13 +86,19 @@ export default {
       this.queryClass()
     },
     clickField (item) {
-      this.field_act = item.sys_enterprise_tradefieldid
+      this.field_act = item ? item.sys_enterprise_tradefieldid : ''
       this.$emit('clickField',item)
     },
     clickClass (item) {
-      this.activeClass = item
-      this.class_act = item.itemclassnum
-      this.change(item)
+      if (item) {
+        this.activeClass = item
+        this.class_act = item.itemclassnum
+        this.change(item)
+      } else {
+        this.class_act = ''
+        this.$emit('onClassChange',item)
+      }
+      
     },
     change(n) {
       console.log(n)

src/SDrpManagement/salerOrder/index.vue

@@ -11,7 +11,28 @@
       :detailPath="{
         path:'/saler_orderDetails'
       }">
-      <div slot="custom"></div>
+      <div slot="custom" style="display:flex">
+        <div class="label_center">
+          <p class="search__label">订单状态:</p>
+          <el-select v-model="status" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.status = status;$refs.basicLayout.listData()">
+            <el-option value="新建" label="新建"></el-option>
+            <el-option value="提交" label="提交"></el-option>
+            <el-option value="审核" label="审核"></el-option>
+            <el-option value="交期待确认" label="交期待确认"></el-option>
+            <el-option value="交期确认" label="交期确认"></el-option>
+            <el-option value="关闭" label="关闭"></el-option>
+          </el-select>
+        </div>
+        <div class="label_center">
+          <p class="search__label">订单类型:</p>
+          <el-select v-model="type" clearable style="margin-right:10px" size="small" placeholder="请选择线索状态" @change="$refs.basicLayout.param.content.pageNumber = 1 ;$refs.basicLayout.param.content.where.type = type;$refs.basicLayout.listData()">
+            <el-option value="标准订单" label="标准订单"></el-option>
+            <el-option value="项目订单" label="项目订单"></el-option>
+            <el-option value="促销订单" label="促销订单"></el-option>
+            <el-option value="工具订单" label="工具订单"></el-option>
+          </el-select>
+        </div>
+      </div>
       <template v-slot:tbList="scope">
         <div v-if="scope.data.column.columnname == 'status'">
           <span style="color:#000000" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
@@ -43,7 +64,9 @@
 export default {
   data () {
     return {
-      options:[]
+      options:[],
+      status:'',
+      type:''
       
     }
   },

src/components/normal-basic-layout/details/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div v-if="refreshPage" style="min-width:1200px">
-    <div style="margin:10px 10px 0 10px;border-radius:5px" class="container normal-panel sticky" @click="closeTags">
+    <div style="margin:10px 10px 0 10px;border-radius:5px;" class="container normal-panel sticky" @click="closeTags">
       <div class="flex-align-start flex-between normal-margin" style="flex-wrap:nowrap">
         <div>
           <p class="main_title mt-10">{{titleText?titleText:'##'}}</p>
@@ -266,6 +266,7 @@ export default {
 .sticky{
   position: sticky;
   top:0;
+  box-shadow: 0 2px 12px 0 rgb(0 0 0 / 10%);
 }
 .no-wrap{
   flex-wrap:nowrap !important;

src/components/normal-basic-layout/modules/table.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-table border stripe ref="tables" :row-class-name="tableClassName" highlight-current-row :data="data" size="mini" @row-click="rowClick" height="calc(100vh - 330px)" style="width:100%;" @selection-change="handleSelectionChange" >
+    <el-table border stripe ref="tables" :row-class-name="tableClassName" :header-cell-style="{background:'#fafafafa',height:'40px','color':'#000000'}" highlight-current-row :data="data" size="mini" @row-click="rowClick" height="calc(100vh - 330px)" style="width:100%;" @selection-change="handleSelectionChange" >
       <!-- <div slot="empty">
         <el-empty :image="require('../../../assets/empty.svg')" :image-size="250">
         </el-empty>
@@ -11,9 +11,11 @@
         align="center"
         @handleSelectionChange="handleSelectionChange">
       </el-table-column>
-      <el-table-column v-for="(col) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width === 0 ? 150 : col.width" :fixed="checkFixed(col.columnname)">
+      <el-table-column show-overflow-tooltip v-for="(col) in layout" :key="col.tablecolid" :prop="col.columnname" :label="col.title" :width="col.width ? col.width : 0" :min-width="col.width === 0 ? 150 : col.width" :fixed="checkFixed(col.columnname)">
         <template slot-scope="scope">
+        
           <slot v-if="col.columnname !== 'operation'" name="customcol" :column="{data:scope.row,columnname:col.columnname}"></slot>
+
           <slot v-if="col.columnname === 'operation'" name="opreation" :data="scope.row"></slot>
         </template>
       </el-table-column>
@@ -99,4 +101,19 @@ export default {
   background: #f1f2f3;
   cursor: pointer;
 }
+
+/deep/.ellipsis {
+  display:-webkit-box;
+  text-overflow:ellipsis;
+  overflow:hidden;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient:vertical;
+}
+
+/deep/.el-table--mini .el-table__cell {
+  padding: 0 !important;
+}
+/deep/.el-table .el-table__cell {
+  padding: 0 !important;
+}
 </style>

src/style/style.css

@@ -231,4 +231,4 @@ ul{
   color:#3874F6;
   text-decoration: underline;
   cursor: pointer;
-}
+}