Merge branch 'xiaoqin' into mergeBranch

src/HDrpManagement/dispatch/index.vue

@@ -40,6 +40,9 @@
           <div v-else-if="scope.data.column.columnname == 'sumamount'">
             {{ scope.data.column.data.sumamount ? tool.formatAmount(scope.data.column.data.sumamount,2) : '--' }}
           </div>
+          <div v-else-if="scope.data.column.columnname == 'sumqty'">
+            {{ scope.data.column.data.sumqty ? tool.formatAmount(scope.data.column.data.sumqty,0) : '--' }}
+          </div>
           <div v-else>
             {{scope.data.column.data[[scope.data.column.columnname]]}}
           </div>

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -101,11 +101,11 @@
         width="120px"
         label="erp即时库存">
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="deliedqty"
         width="120px"
         label="drp可发货数量">
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="操作"  width="90">
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>

src/HDrpManagement/invoiceapp/detail/detail.vue

@@ -22,7 +22,7 @@
         <el-button v-if="tool.checkAuth($route.name,'toManual')" type="primary" size="mini" class="inline-16" :disabled="mainData.byhand === 1 || mainData.status !== '新建' && mainData.status !== '提交'" @click="toManual">转手工</el-button>
       </div>
       <div slot="slot0" >
-        <invoiceOrder :status="mainData.status" :sys_enterpriseid="mainData.sys_enterpriseid"></invoiceOrder>
+        <invoiceOrder @onSuccess="queryMainData" :status="mainData.status" :sys_enterpriseid="mainData.sys_enterpriseid"></invoiceOrder>
       </div>
       <div slot="slot1" >
         <blueInvoice :data="mainData"></blueInvoice>
@@ -63,6 +63,7 @@ export default {
       const res = await this.$api.requested({
         "id":20221216143003,
         "content": {
+          "nocache":true,
           "sa_invoiceapplyid": this.$route.query.id
         }
       })

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/components/changeOrderline.vue

@@ -23,7 +23,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" style="width:120px" @click="dialogTableVisible = false">取 消</el-button>
+        <el-button size="small" style="width:120px" @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="warning" size="small" style="width:120px" :disabled="showErrorMsg" @click="submit">确 定</el-button>
       </div>
     </el-dialog>

src/HDrpManagement/invoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -17,7 +17,7 @@
       <el-table-column prop="remarks" label="备注" min-width="150"></el-table-column>
       <el-table-column label="操作" width="90" fixed="right">
         <template slot-scope="scope">
-          <changeOrderline v-if="tool.checkAuth($route.name,'InvioceOrder')" class="inline-16" :row="scope.row" :status="status" @onSuccess="listData"></changeOrderline>
+          <changeOrderline v-if="tool.checkAuth($route.name,'InvioceOrder')" class="inline-16" :row="scope.row" :status="status" @onSuccess="listData();$emit('onSuccess')"></changeOrderline>
           <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" size="small" type="text" @click="deleteRow(scope.row)">删 除</el-button>
         </template>
       </el-table-column>

src/HDrpManagement/orderManage/modules/edit.vue

@@ -92,9 +92,16 @@
                 </el-table-column>
                 <el-table-column
                   label="操作"
-                  width="90">
+                  width="120px">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="(defaultData.fin_info = scope.row,visible2 = false)" size="mini">选 择</el-button>
+                    <el-button class="inline-16" type="text" @click="(defaultData.fin_info = scope.row,visible2 = false)" size="mini">选 择</el-button>
+                    <delete-btn 
+                      message="确定删除当前信息吗?"
+                      nameId="20221013160502" 
+                      nameKey="sys_enterprise_financeids" 
+                      :id="scope.row.sys_enterprise_financeid"
+                      @deleteSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"
+                    ></delete-btn>
                   </template>
                 </el-table-column>
               </el-table>
@@ -147,9 +154,17 @@
                 </el-table-column>
                 <el-table-column
                   label="操作"
-                  width="90">
+                  width="120">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                    <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                    <delete-btn 
+                      message="确定删除当前地址吗?"
+                      nameId="20221009155903" 
+                      nameKey="contactsid" 
+                      :id="scope.row.contactsid"
+                      :isNumber="true"
+                      @deleteSuccess="receiveAddress"
+                    ></delete-btn>
                   </template>
                 </el-table-column>
               </el-table>

src/HDrpManagement/serveBill/modules/workBill/index.vue

@@ -56,6 +56,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 export default {
   props:["data"],
   data () {
@@ -142,6 +143,7 @@ export default {
   },
   created() {
     this.listData()
+    console.log(this.$route.name);
     this.tablecols = this.tool.tabelCol(this.$route.name).andWorkBillTable.tablecols
   }
 }

src/HDrpManagement/serveBillMag/index.vue

@@ -11,7 +11,7 @@
       :apiId="{query:20230206091703,del:20230206091803}"
       :options="options"
       :detailPath="{
-        path:'/serveBillDetail'
+        path:'/serveBillMagDetail'
       }"
       @listData="list">
       <div slot="custom" style="display:flex">

src/HDrpManagement/serveWorkBill/modules/checkBill/index.vue

@@ -53,10 +53,10 @@ export default {
         "id": 20230211105903,
         "version":1,
         "content": {
-            "sa_workorderid":'',
             "pageNumber":1,
             "pageSize":20,
             "where":{
+              "sa_workorderid":'',
               "condition":''
             }
         }
@@ -68,7 +68,7 @@ export default {
   },
   methods:{
     async listData(){
-      this.params.content.sa_workorderid = this.$route.query.id
+      this.params.content.where.sa_workorderid = this.$route.query.id
       const res = await this.$api.requested(this.params)
       this.list = res.data
       this.total = res.total

src/HDrpManagement/serveWorkBill/modules/teamList/index.vue

@@ -46,7 +46,7 @@
               label="操作">
               <template slot-scope="scope">
                   <el-button :disabled="!tool.checkAuth($route.name,'teamHandle')" class="inline-16" size="mini" type="text" @click="delPeople(scope.row)">删 除</el-button>
-                  <el-button :disabled="scope.row.isleader || !tool.checkAuth($route.name,'teamHandle')" size="mini" type="text" @click="setLeader(scope.row)">设 置 负 责 人</el-button>
+                  <el-button :disabled="!!scope.row.isleader || !tool.checkAuth($route.name,'teamHandle')" size="mini" type="text" @click="setLeader(scope.row)">设 置 负 责 人</el-button>
               </template>
           </el-table-column>
         </el-table>

src/HDrpManagement/writeoffbill/components/add.vue

@@ -42,6 +42,11 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="12">
+              <el-form-item label="备注" prop="remarks">
+                <el-input size="small" type="textarea" placeholder="请输入备注" v-model.number="form.remarks"></el-input>
+              </el-form-item>
+            </el-col>
             <el-col :span="24">
               <el-form-item label="订单">
                 <div class="flex-align-center flex-between mt-10">
@@ -102,9 +107,9 @@ export default {
         "sys_enterpriseid": "",
         "sa_accountclassid": "",
         "sa_cashbillid":"",
-        "remarks":"",
         "writeoffamount":0,  //新增时可不传
-        "billnodate": ''
+        "billnodate": '',
+        "remarks":''
       },
       rules:{
         sys_enterpriseid:[

src/HDrpManagement/writeoffbill/components/edit.vue

@@ -45,6 +45,11 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
+            <el-col :span="24">
+              <el-form-item label="备注" prop="remarks">
+                <el-input size="small" type="textarea" placeholder="请输入备注" v-model.number="form.remarks"></el-input>
+              </el-form-item>
+            </el-col>
           </el-form>
         </el-row>
       </div>

src/HManagement/accountManage/modules/account_detail.vue

@@ -15,6 +15,7 @@
       @pageChange="pageChange"
       @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" >
+        <restPas v-if="tool.checkAuth($route.name,'restpas')" :userid="mainData.userid" class="inline-16"></restPas>
         <useTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></useTemp>
         <unuseTemp v-if="tool.checkAuth($route.name,'use')" :data="mainData" @onSuccess="queryMainData"></unuseTemp>
       </div>
@@ -38,6 +39,7 @@
 <script>
 import unuseTemp from './unuseAccount.vue'
 import useTemp from './useAccdount.vue'
+import restPas from "@/HManagement/department/staff/detail/modules/restPassword"
 
 import detailInfo from '@/components/detailInfo/index'
 import teamInformation from './teamInformation/index'
@@ -62,7 +64,8 @@ export default {
     unuseTemp,
     useTemp,
     detailInfo,
-    teamInformation
+    teamInformation,
+    restPas
   },
   methods:{
     async queryMainData(id) {

src/HManagement/department/staff/detail/index.vue

@@ -19,7 +19,7 @@
       <div slot="customOperation" >
         <linkAccount class="inline-16" v-if="tool.checkAuth($route.name,'update')"  :data="mainData"  @onSuccess="queryMainData"></linkAccount>
         <createUser class="inline-16" v-if="tool.checkAuth($route.name,'update') && !mainData.userid" :data="mainData"  @onSuccess="queryMainData"></createUser>
-        <restPas v-if="tool.checkAuth($route.name,'restpas')" :userid="mainData.userid" class="inline-16"></restPas>
+        <!-- <restPas v-if="tool.checkAuth($route.name,'restpas')" :userid="mainData.userid" class="inline-16"></restPas> -->
       </div>
       <div class="container normal-panel" slot="slot0" >
         <baseInfo :mainInfo="mainData"></baseInfo>

src/HManagement/submit/list/modules/submit_edit.vue

@@ -246,8 +246,6 @@ export default {
     },
     // 新增授权范围
     async insertCoursewareauth(data) {
-      console.log(data,'触发1');
-      
       this.authData.sat_submiteditmodelid = data.sat_submiteditmodelid
       if (this.authData.departmentid.length == 0) this.authData.departmentid = this.defaultData.departmentid
       if (this.authData.hrid.length == 0) this.authData.hrid = this.defaultData.hrid
@@ -257,14 +255,10 @@ export default {
         "id":"20221102094302",
         "content": this.authData
       })
-      console.log('触发2');
-      
-      res.code === 0 ? this.$notify({
-        title: '失败',
-        message: res.data,
-        type: 'error'
-      }) : this.querySubmitMain()
-
+      this.tool.showMessage(res,() => {
+        this.querySubmitMain()
+        this.query_auth()
+      })
     },
     // 查询授权信息
     async query_auth() {

src/SDrpManagement/agentOrder/modules/edit.vue

@@ -87,9 +87,16 @@
                 </el-table-column>
                 <el-table-column
                   label="操作"
-                  width="90">
+                  width="120">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="(defaultData.fin_info = scope.row,visible2 = false)" size="mini">选 择</el-button>
+                    <el-button class="inline-16" type="text" @click="(defaultData.fin_info = scope.row,visible2 = false)" size="mini">选 择</el-button>
+                    <delete-btn 
+                      message="确定删除当前信息吗?"
+                      nameId="20221013160502" 
+                      nameKey="sys_enterprise_financeids" 
+                      :id="scope.row.sys_enterprise_financeid"
+                      @deleteSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"
+                    ></delete-btn>
                   </template>
                 </el-table-column>
               </el-table>
@@ -147,9 +154,17 @@
                 </el-table-column>
                 <el-table-column
                   label="操作"
-                  width="90">
+                  width="120">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                    <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                    <delete-btn 
+                      message="确定删除当前地址吗?"
+                      nameId="20221009155903" 
+                      nameKey="contactsid" 
+                      :id="scope.row.contactsid"
+                      :isNumber="true"
+                      @deleteSuccess="receiveAddress"
+                    ></delete-btn>
                   </template>
                 </el-table-column>
               </el-table>

src/SDrpManagement/invoiceapp_saler/detail/detail.vue

@@ -22,7 +22,7 @@
         <el-button v-if="tool.checkAuth($route.name,'toManual')" type="primary" size="mini" class="inline-16" :disabled="mainData.byhand === 1 || mainData.status !== '新建'" @click="toManual">转手工</el-button>
       </div>
       <div slot="slot0" >
-        <invoiceOrder :status="mainData.status" :sys_enterpriseid="mainData.sys_enterpriseid"></invoiceOrder>
+        <invoiceOrder @onSuccess="queryMainData" :status="mainData.status" :sys_enterpriseid="mainData.sys_enterpriseid"></invoiceOrder>
       </div>
       <div slot="slot1" >
         <blueInvoice :data="mainData"></blueInvoice>
@@ -57,6 +57,7 @@ export default {
       const res = await this.$api.requested({
         "id":20221216143003,
         "content": {
+          "nocache":true,
           "sa_invoiceapplyid": this.$route.query.id
         }
       })

src/SDrpManagement/invoiceapp_saler/detail/tab/invoiceOrder/components/changeOrderline.vue

@@ -23,7 +23,7 @@
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button size="small" style="width:120px" @click="dialogTableVisible = false">取 消</el-button>
+        <el-button size="small" style="width:120px" @click="dialogFormVisible = false">取 消</el-button>
         <el-button type="warning" size="small" style="width:120px" :disabled="showErrorMsg" @click="submit">确 定</el-button>
       </div>
     </el-dialog>

src/SDrpManagement/invoiceapp_saler/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -14,7 +14,7 @@
       <el-table-column prop="remarks" label="备注" min-width="150"></el-table-column>
       <el-table-column label="操作" width="90" fixed="right">
         <template slot-scope="scope">
-          <changeOrderline v-if="tool.checkAuth($route.name,'InvioceOrder')" class="inline-16" :row="scope.row" :status="status" @onSuccess="listData"></changeOrderline>
+          <changeOrderline v-if="tool.checkAuth($route.name,'InvioceOrder')" class="inline-16" :row="scope.row" :status="status" @onSuccess="listData();$emit('onSuccess')"></changeOrderline>
           <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" size="small" type="text" @click="deleteRow(scope.row)">删 除</el-button>
         </template>
       </el-table-column>

src/SDrpManagement/salerOrder/modules/edit.vue

@@ -80,9 +80,16 @@
                 </el-table-column>
                 <el-table-column
                   label="操作"
-                  width="90">
+                  width="120">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="(defaultData.fin_info = scope.row,visible2 = false)" size="mini">选 择</el-button>
+                    <el-button class="inline-16" type="text" @click="(defaultData.fin_info = scope.row,visible2 = false)" size="mini">选 择</el-button>
+                    <delete-btn 
+                      message="确定删除当前信息吗?"
+                      nameId="20221013160502" 
+                      nameKey="sys_enterprise_financeids" 
+                      :id="scope.row.sys_enterprise_financeid"
+                      @deleteSuccess="thisDetail().queryMainData().then(() => {setDefaultData()})"
+                    ></delete-btn>
                   </template>
                 </el-table-column>
               </el-table>
@@ -137,9 +144,17 @@
                 </el-table-column>
                 <el-table-column
                   label="操作"
-                  width="90">
+                  width="120">
                   <template slot-scope="scope">
-                    <el-button type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                    <el-button class="inline-16" type="text" @click="(defaultData.re_info = scope.row,visible = false)" size="mini">选 择</el-button>
+                    <delete-btn 
+                      message="确定删除当前地址吗?"
+                      nameId="20221009155903" 
+                      nameKey="contactsid" 
+                      :id="scope.row.contactsid"
+                      :isNumber="true"
+                      @deleteSuccess="receiveAddress"
+                    ></delete-btn>
                   </template>
                 </el-table-column>
               </el-table>

src/SDrpManagement/sinvoiceapp/detail/detail.vue

@@ -21,7 +21,7 @@
         <!-- <el-button v-if="tool.checkAuth($route.name,'toManual')" type="primary" size="mini" class="inline-16" :disabled="mainData.byhand === 1 || mainData.status !== '新建'" @click="toManual">转手工</el-button> -->
       </div>
       <div slot="slot0" >
-        <invoiceOrder :status="mainData.status" :sys_enterpriseid="mainData.sys_enterpriseid"></invoiceOrder>
+        <invoiceOrder @onSuccess="queryMainData" :status="mainData.status" :sys_enterpriseid="mainData.sys_enterpriseid"></invoiceOrder>
       </div>
       <div slot="slot1" >
         <blueInvoice :status="mainData.status"></blueInvoice>

src/SDrpManagement/sinvoiceapp/detail/tab/invoiceOrder/invoiceOrder.vue

@@ -14,7 +14,7 @@
       <el-table-column prop="remarks" label="备注" min-width="150"></el-table-column>
       <el-table-column label="操作" width="90" fixed="right">
         <template slot-scope="scope">
-          <changeOrderline v-if="tool.checkAuth($route.name,'InvioceOrder')" class="inline-16" :row="scope.row" :status="status" @onSuccess="listData"></changeOrderline>
+          <changeOrderline v-if="tool.checkAuth($route.name,'InvioceOrder')" class="inline-16" :row="scope.row" :status="status" @onSuccess="listData();$emit('onSuccess')"></changeOrderline>
           <el-button v-if="tool.checkAuth($route.name,'InvioceOrder')" :disabled="status !== '新建'" size="small" type="text" @click="deleteRow(scope.row)">删 除</el-button>
         </template>
       </el-table-column>

src/components/delete_btn/index.vue

@@ -14,13 +14,13 @@ nameId:接口id
 nameKey:接口字段
  */
 export default {
-  props: ['id','nameId','nameKey','type','disabled','data','message'],
+  props: ['id','nameId','nameKey','type','disabled','data','message','isNumber'],
   data () {
     return {
       param: {
         "id":this.nameId,
         "content":{
-          "sa_contractid": this.$route.query.id,
+          // "sa_contractid": this.$route.query.id,
           [this.nameKey]:[this.id]
         }
       }
@@ -28,7 +28,7 @@ export default {
   },
   methods: {
     async deleteRow() {
-      this.param.content[this.nameKey] = [this.id]
+      this.param.content[this.nameKey] = this.isNumber ? this.id : [this.id]
       let res = await this.$api.requested(this.param)
       this.tool.showMessage(res,() => {
         this.$emit('deleteSuccess',this.data ? this.data : '')

src/components/normal-basic-layout/details/modules/group/group.vue

@@ -30,7 +30,7 @@
         <el-empty description="暂无负责人" :image-size="40"></el-empty>
       </div>
     </div>
-    <!-- <div class="flex-align-center" style="border-bottom:1px solid #f1f2f3;padding:0 10px">
+    <div class="flex-align-center" style="border-bottom:1px solid #f1f2f3;padding:0 10px">
       <p style="flex:1;padding:10px 0;color:#999">参与者</p>
       <el-popover
         placement="right"
@@ -40,8 +40,8 @@
         <member ref="member1" :justsaler="justsaler" :param="param" :radio="false" :checked="item.team" @onSelect="onSubmit" @onCancel="visible = false"></member>
         <el-button v-show="item.teamleader[0] && nowUserid === item.teamleader[0].userid" type="text" size="small" slot="reference"  @click="showMenberSelect1(item)">添加</el-button>
       </el-popover>
-    </div> -->
-    <!-- <div style="padding:10px">
+    </div>
+    <div style="padding:10px">
       <div class="flex-align-center" style="margin-bottom:16px" v-show="men.isleader === 0" v-for="men in item.team" :key="men.index">
         <div class="avatar inline-16"  :class="men.isleader === 1?'leader':''" >
           <img class="avatar__image" v-if="men.headpic" :src="men.headpic" alt="">
@@ -54,7 +54,7 @@
         <div style="float: right;margin-left: 60px">
           <el-button v-show="item.teamleader[0] && nowUserid === item.teamleader[0].userid" type="text" @click="setClick(men)" size="mini">设置</el-button>
         </div>
-      </div> -->
+      </div>
 
       <div v-if="showEmpty(item.team)">
         <el-empty description="暂无成员" :image-size="40"></el-empty>

src/components/scopeOfAuthority/modules/dep_auth.vue

@@ -47,6 +47,7 @@
 </template>
 
 <script>
+import { log } from '@antv/g2plot/lib/utils'
 
 import {mapGetters} from 'vuex'
 
@@ -178,6 +179,7 @@ export default {
     },
     // 监听部门勾选变化
     checkChange (a,b,c) {
+      console.log(b,'是否');
       let arr = this.departmentids.filter((e)=>{
         if (e !== a.departmentid) return e
       })
@@ -193,7 +195,8 @@ export default {
         this.departmentids = arr
       }
       this.departmentids = [...new Set(this.departmentids)]
-      this.$refs.tree.setCheckedKeys(this.departmentids)
+      console.log(this.departmentids,'数据');
+      // this.$refs.tree.setCheckedKeys(this.departmentids)
       this.$emit('onParams',this.departmentids,this.checkedMenbers,this.isonlymanager_dept)
     },
     // 勾选人员

src/components/scopeOfAuthority/modules/mar_auth.vue

@@ -188,7 +188,7 @@ export default {
         this.saleareaids = arr
       }
       this.saleareaids = [...new Set(this.saleareaids)]
-      this.$refs.tree.setCheckedKeys(this.saleareaids)
+      // this.$refs.tree.setCheckedKeys(this.saleareaids)
       this.$emit('onAgentParams',this.saleareaids,this.checkedMenbers,this.isonlymanager_agent)
     },
     // 勾选人员

src/views/message/components/list.vue

@@ -66,7 +66,8 @@ export default {
   border-bottom: 1px solid #eeeeee;
   display: flex;
   justify-content: space-between;
-  padding: 20px 0;
+  padding: 20px 100px 20px 0;
+  position: relative;
 }
 .list .item-box .item:last-child {
 }
@@ -108,6 +109,9 @@ export default {
   font-size: 12px;
   font-weight: 400;
   color: #999999;
+}
+.list .item-box .item .right {
+  
 }
 .list .item-box .item .right .read {
   background: #FFEBEA;