bug修复

src/HDrpManagement/contractManage/components/productList/addProduct.vue

@@ -11,6 +11,11 @@
         style="width: 100%"
         height="300"
         border>
+        <el-table-column
+            prop="status"
+            label="状态"
+            width="180">
+        </el-table-column>
         <el-table-column
           prop="billno"
           label="单号"
@@ -25,7 +30,9 @@
           prop="submitdate"
           label="提交时间">
         </el-table-column>
-        <el-table-column>
+        <el-table-column
+          label="操作"
+        >
           <template slot-scope="scope">
             <el-button size="mini" type="text" @click="rowClick(scope.row)">选 择</el-button>
           </template>

src/HDrpManagement/contractManage/index.vue

@@ -40,7 +40,7 @@
             v-model="type"
             placeholder="请选择合同类型"
             clearable
-            @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.where.type=type;$refs.list.listData()"
+            @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.where.type=type;$refs.list.param.content.type = area;$refs.list.listData()"
           >
             <el-option
               v-for="item in typeList"
@@ -58,7 +58,7 @@
             v-model="status"
             placeholder="请选择合同状态"
             clearable
-            @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.where.status=status;$refs.list.listData()"
+            @change="$refs.list.param.content.pageNumber=1;$refs.list.param.content.where.type=type;$refs.list.param.content.type = area;$refs.list.param.content.where.status=status;$refs.list.listData()"
           >
             <el-option label="新建" value="新建" ></el-option>
             <el-option label="审核" value="审核" ></el-option>
@@ -212,7 +212,7 @@ export default {
       
     },
     list (params) {
-      params.content.type = 0
+      params.content.type = 1
       params.content.deleted = 0
     },
     listdata(data) {
@@ -233,6 +233,9 @@ export default {
         this.selectParam.begindate = ''
         this.selectParam.enddate = ''
       }
+      this.$refs.list.param.content.type = this.area
+      this.selectParam.type = this.type
+      this.selectParam.status = this.status
       this.$refs.list.param.content.where = this.selectParam
       this.$refs.list.listData()
     },

src/HDrpManagement/publicCustomer/modules/detail.vue

@@ -27,7 +27,7 @@
 <!--        <div class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')">
           <to_void  :id="mainData.sa_customersid"  @toVoidSuccess="onSuccess"></to_void>
         </div>-->
-        <el-button  type="primary" size="small" v-if="tool.checkAuth($route.name,'deletePublic')" @click="deleteData" class="inline-16">删 除</el-button>
+        <el-button  type="primary" size="mini" v-if="tool.checkAuth($route.name,'deletePublic')" @click="deleteData" class="inline-16">删 除</el-button>
       </div>
       <div slot="slot0" >
         <detailed :data="mainData" ref="detailed"></detailed>

src/HDrpManagement/publicCustomer/modules/detail/addressManage/modules/toVoid.vue

@@ -1,9 +1,9 @@
 <template>
   <div class="inline-16">
     <el-popconfirm
-        title="确定要作废该客户地址嘛？"
-        @confirm="toVoidRow()">
-      <el-button slot="reference" size="small" type="text">作 废</el-button>
+        title="确定要删除该客户地址嘛？"
+        @confirm="onSubmit()">
+      <el-button slot="reference" size="small" type="text">删 除</el-button>
     </el-popconfirm>
     <el-dialog
         :visible.sync="dialogToVoidVisible"
@@ -58,18 +58,17 @@ export default {
       this.form.sys_enterpriseid = this.data.sys_enterpriseid
       this.form.contactsid = this.data.contactsid
     },
-    onSubmit(){
-      this.$refs['form'].validate(async (valid) => {
-        if (!valid) return false
-        const res = await this.$api.requested({
-          "id": "20221018145502",
-          "content": this.form
-        })
-        this.tool.showMessage(res,()=>{
-          this.$emit("toVoidSuccess")
-          this.$refs['form'].resetFields()
-          this.dialogToVoidVisible = false
-        })
+    async onSubmit(){
+      this.form.sys_enterpriseid = this.data.sys_enterpriseid
+      this.form.contactsid = this.data.contactsid
+      const res = await this.$api.requested({
+        "id": "20221018145502",
+        "content": this.form
+      })
+      this.tool.showMessage(res,()=>{
+        this.$emit("toVoidSuccess")
+        this.$refs['form'].resetFields()
+        this.dialogToVoidVisible = false
       })
     }
   }

src/HManagement/clueManage/clue_public/modules/distribution_saler.vue

@@ -10,7 +10,7 @@
           <template v-slot:customcol="scope">
             <div v-if="scope.column.columnname === 'sales'">
               <div v-if="scope.column.data.sales.length > 0">
-                <el-tag size="mini" v-for="item in scope.column.data.sales" :key="item.hrid" effect="plain">{{item.name}}</el-tag>
+                <el-tag size="mini" v-for="item in scope.column.data.sales" :key="item.hrid" effect="plain" style="margin-right: 5px">{{item.name}}</el-tag>
               </div>
               <p class="tips" v-else>未匹配</p>
             </div>

src/HManagement/task/modules/detail.vue

@@ -14,13 +14,12 @@
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
       <div slot="customOperation" >
-        <complete-task :data="mainData" style="display:inline" @onSuccess="queryMainData()"></complete-task>
-        <el-button class="inline-16" type="default" size="mini" @click="deleteTask">删 除</el-button>
+        <complete-task :data="mainData" v-if="tool.checkAuth($route.name,'complete')" style="display:inline" @onSuccess="queryMainData()"></complete-task>
+        <el-button class="inline-16" v-if="tool.checkAuth($route.name,'delete')" type="primary" size="mini" @click="deleteTask">删 除</el-button>
       </div>
       <div slot="slot0" class="task__content">
         <p class="mt-10">标题:{{mainData.title}}</p>
         <p>内容:{{mainData.remarks}}</p>
-        
       </div>
       <div slot="slot1" >
       </div>

src/SDrpManagement/QuotedPrice/index.vue

@@ -87,6 +87,9 @@
           </div>
 
         </div>
+        <div v-else-if="scope.data.column.columnname === 'name'">
+          <span>{{scope.data.column.data.leader.length !== 0?scope.data.column.data.leader[0].name:'--'}}</span>
+        </div>
         <div v-else-if="scope.data.column.columnname === 'status'">
           <span style="color:#3874f6" v-if="scope.data.column.data[[scope.data.column.columnname]] == '新建'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>
           <span style="color:#52c41a" v-else-if="scope.data.column.data[[scope.data.column.columnname]] == '提交'">{{scope.data.column.data[[scope.data.column.columnname]]}}</span>

src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/index.vue

@@ -25,9 +25,9 @@
       <el-table-column
         prop="address"
         label="开票地址">
-        <template slot-scope="scope">
+<!--        <template slot-scope="scope">
           {{scope.row.address}}&nbsp;<i style="color:red" v-if="scope.row.isdefault === 1" class="el-icon-place"></i>
-        </template>
+        </template>-->
       </el-table-column>
       <el-table-column
         prop="enterprisename"

src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/modules/add.vue

@@ -13,27 +13,27 @@
           <el-form-item label="抬头" prop="enterprisename">
             <el-input v-model="form.enterprisename" placeholder="抬头"></el-input>
           </el-form-item>
-          <el-form-item label="开票地址" prop="address">
+          <el-form-item label="开票地址" >
             <el-input v-model="form.address" placeholder="开票地址"></el-input>
           </el-form-item>
           <el-form-item label="税号" prop="taxno">
             <el-input v-model="form.taxno" placeholder="统一社会信用代码"></el-input>
           </el-form-item>
-          <el-form-item label="开户行" prop="bank">
+          <el-form-item label="开户行" >
             <el-input v-model="form.bank" placeholder="统一社会信用代码"></el-input>
           </el-form-item>
-          <el-form-item label="开户账号" prop="bankcardno">
+          <el-form-item label="开户账号" >
             <el-input v-model="form.bankcardno" placeholder="开户账号"></el-input>
           </el-form-item>
-          <el-form-item label="联系电话" prop="phonenumber">
+          <el-form-item label="联系电话" >
             <el-input v-model="form.phonenumber" placeholder="手机号（电话）"></el-input>
           </el-form-item>
           <el-form-item label="备注" prop="remarks">
             <el-input v-model="form.remarks" placeholder="备注"></el-input>
           </el-form-item>
-          <el-form-item>
+<!--          <el-form-item>
             <el-button icon="el-icon-place" type="text">设置为默认地址</el-button>
-          </el-form-item>
+          </el-form-item>-->
         </el-form>
       </div>
       <div class="fixed__btn__panel">
@@ -69,6 +69,9 @@ export default {
         address: [
           { required: true, message: '请输入开票地址', trigger: 'blur' },
         ],
+        taxno: [
+          { required: true, message: '请输入税号', trigger: 'blur' },
+        ],
         bank: [
           { required: true, message: '请输入开户行', trigger: 'blur' },
         ],
@@ -99,6 +102,9 @@ export default {
       });
 
     }
+  },
+  mounted() {
+    this.form.enterprisename = this.data.enterprisename
   }
 }
 

src/SDrpManagement/salerPrivatecustomer/detail/modules/financialInfo/modules/edit.vue

@@ -2,8 +2,9 @@
   <div>
     <el-button type="text" size="mini" @click="onShow(drawer = true)" :disabled="!tool.checkAuth($route.name,'quotationInfoManage') || !disable">编 辑</el-button>
     <el-drawer
-      title="新建"
+      title="编辑"
       :visible.sync="drawer"
+      :show-close="false"
       direction="rtl"
       append-to-body
       size="700px">
@@ -12,27 +13,27 @@
           <el-form-item label="抬头" prop="enterprisename">
             <el-input v-model="form.enterprisename" placeholder="抬头"></el-input>
           </el-form-item>
-          <el-form-item label="开票地址" prop="address">
+          <el-form-item label="开票地址" >
             <el-input v-model="form.address" placeholder="开票地址"></el-input>
           </el-form-item>
           <el-form-item label="税号" prop="taxno">
             <el-input v-model="form.taxno" placeholder="统一社会信用代码"></el-input>
           </el-form-item>
-          <el-form-item label="开户行" prop="bank">
+          <el-form-item label="开户行" >
             <el-input v-model="form.bank" placeholder="统一社会信用代码"></el-input>
           </el-form-item>
-          <el-form-item label="开户账号" prop="bankcardno">
+          <el-form-item label="开户账号" >
             <el-input v-model="form.bankcardno" placeholder="开户账号"></el-input>
           </el-form-item>
-          <el-form-item label="联系电话" prop="phonenumber">
+          <el-form-item label="联系电话" >
             <el-input v-model="form.phonenumber" placeholder="手机号（电话）"></el-input>
           </el-form-item>
-          <el-form-item label="备注" prop="remarks">
+          <el-form-item label="备注" >
             <el-input v-model="form.remarks" placeholder="备注"></el-input>
           </el-form-item>
-          <el-form-item>
+<!--          <el-form-item>
             <el-button icon="el-icon-place" type="text" @click="onSubmit(form.isdefault = 1)">设置为默认地址</el-button>
-          </el-form-item>
+          </el-form-item>-->
         </el-form>
       </div>
       <div class="fixed__btn__panel">
@@ -65,6 +66,9 @@ export default {
         enterprisename: [
           { required: true, message: '请输入抬头', trigger: 'blur' },
         ],
+        taxno: [
+          { required: true, message: '请输入税号', trigger: 'blur' },
+        ],
         address: [
           { required: true, message: '请输入开票地址', trigger: 'blur' },
         ],

src/SManagement/project_target/index.vue

@@ -3,6 +3,10 @@
     <div slot="titleRight">
       <el-button type="primary" plain size="small" @click="export1" v-if="tool.checkAuth($route.name,'export')">导出</el-button>
     </div>
+    <div slot="refresh">
+      <i class="el-icon-refresh" @click="refresh"></i>
+<!--      <el-button  icon="el-icon-refresh" @click="refresh"></el-button>-->
+    </div>
     <div slot="content">
       <div class="personal-target">
         <div class="container normal-panel">
@@ -88,6 +92,9 @@ export default {
       this.tool.showMessage(res,() => {
         window.open(res.msg,'_self')
       })
+    },
+    refresh(){
+     this.$refs.table.queryData()
     }
   },
 };

src/SManagement/project_target/modules/components/delProject.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button type="text" size="mini" @click="onShow" :disabled="disabled">删除</el-button>
+    <el-button type="text" size="mini" @click="onShow" :disabled="!tool.checkAuth($route.name,'editProjectTask') || disabled">删除</el-button>
 <!--    <el-popconfirm
         title="确定删除该项目嘛？"
     >

src/SManagement/project_target/modules/detailInfo.vue

@@ -29,7 +29,7 @@
 
     <div slot="slot0">
       <div class="mt-10">
-        <project_add v-if="tool.checkAuth($route.name,'addProject') && mainData.status === '新建'"  :id="this.$route.query.id" :year="this.$route.query.year" @onSuccess="onSuccess" :disabled="disable" class="inline-16"></project_add>
+        <project_add v-if="tool.checkAuth($route.name,'editProjectTask') && mainData.status === '新建'"  :id="this.$route.query.id" :year="this.$route.query.year" @onSuccess="onSuccess" :disabled="disable" class="inline-16"></project_add>
         <el-input  style="width:200px;" placeholder="请输入搜索内容" suffix-icon="el-icon-search" @input="searchChange" v-model="params.content.where.condition" @keyup.native.enter="getprojectTargetList(params.content.pageNumber = 1)" @clear="getprojectTargetList(params.content.pageNumber = 1)" size="small" class="input-with-select inline-16" clearable>
         </el-input>
       </div>
@@ -56,9 +56,9 @@
         </template>
 
         <template v-slot:opreation="scope">
-          <el-button type="text" size="mini" class="inline-16"  @click="edit(scope.data)" v-if="editShow && tool.checkAuth($route.name,'editProjectTask')" :disabled="disable || mainData.status !== '新建'">编辑</el-button>
+          <el-button type="text" size="mini" class="inline-16"  @click="edit(scope.data)" v-if="editShow  " :disabled="!tool.checkAuth($route.name,'editProjectTask') || disable || mainData.status !== '新建'">编辑</el-button>
           <el-button type="text" style="color: #e09a1a" size="mini" class="inline-16" v-if="saveShow && actindex === (scope.data.index + 1)" @click="save(scope.data)">保存</el-button>
-          <project_del class="inline-16" :status="mainData.status" v-if="editShow && tool.checkAuth($route.name,'deleteProject')" :data="scope.data" @onDel="onProjectSuccess" :disabled="disable || mainData.status !== '新建'"></project_del>
+          <project_del class="inline-16" :status="mainData.status" v-if="editShow " :data="scope.data" @onDel="onProjectSuccess" :disabled="disable || mainData.status !== '新建'"></project_del>
         </template>
       </tableLayout>
       <div>

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

@@ -11,7 +11,8 @@
         <slot name="titleRight"></slot>
       </div>
       <div>
-      <i class="el-icon-refresh" @click="refresh"></i>
+<!--      <i class="el-icon-refresh" @click="refresh"></i>-->
+        <slot name="refresh"></slot>
       </div>
     </div>
     <slot name="content"></slot>