Merge branch 'mergeBranch' of http://124.70.211.186:3000/zhangqi/yos_web into mergeBranch

src/Form/projectChange/add.vue

@@ -115,7 +115,7 @@
                     v-model="form.begdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -127,7 +127,7 @@
                     v-model="form.enddate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>

src/Form/projectChange/edit.vue

@@ -122,7 +122,7 @@
                     v-model="form.begdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -134,7 +134,7 @@
                     v-model="form.enddate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -146,6 +146,7 @@
                     v-model="form.signdate_due"
                     type="month"
                     placeholder="选择月份"
+                    :picker-options="pickerOptions"
                     @change="timeChange">
                 </el-date-picker>
               </el-form-item>

src/HDrpManagement/ProductMag/index.vue

@@ -58,7 +58,7 @@
       <template #custom>
         <div class="mt-10">
           <label  class="search__label" >是否上架:</label>
-          <el-select class="inline-24" v-model="selectParam.isonsale" placeholder="请选择是否上架" @change="selectChange" size="small" >
+          <el-select class="inline-24" v-model="selectParam.isonsale" placeholder="请选择是否上架" @change="selectChange" size="small" clearable>
             <el-option
                 v-for="item in isOnSaleData"
                 :key="item.value"

src/HDrpManagement/contractManage/components/submitCheck.vue

@@ -41,21 +41,43 @@ export default {
           })
         })
       } else {
-        this.$confirm('确定进行审核操作吗？','提示',{
-          confirmButtonText:'确定',
-          cancelButtonText:'取消'
-        }).then(async () => {
-          let res = await this.$api.requested({
-            "id": 20221121203102,
-            "content": {
+        console.log(this.data,'审核数据')
+        console.log(new Date(this.data.enddate))
+        console.log(new Date())
+        console.log(new Date() > new Date(this.data.enddate))
+        if (new Date() > new Date(this.data.enddate)){
+          this.$confirm('当前合同有效期已过期，是否确定继续审核？','提示',{
+            confirmButtonText:'确定',
+            cancelButtonText:'取消'
+          }).then(async () => {
+            let res = await this.$api.requested({
+              "id": 20221121203102,
+              "content": {
                 "type":1,//0：不通过，1：通过
                 "sa_contractid": this.data.sa_contractid
-            },
+              },
+            })
+            this.tool.showMessage(res,() => {
+              this.$emit('onSuccess')
+            })
           })
-          this.tool.showMessage(res,() => {
-            this.$emit('onSuccess')
+        }else {
+          this.$confirm('确定进行审核操作吗？','提示',{
+            confirmButtonText:'确定',
+            cancelButtonText:'取消'
+          }).then(async () => {
+            let res = await this.$api.requested({
+              "id": 20221121203102,
+              "content": {
+                "type":1,//0：不通过，1：通过
+                "sa_contractid": this.data.sa_contractid
+              },
+            })
+            this.tool.showMessage(res,() => {
+              this.$emit('onSuccess')
+            })
           })
-        })
+        }
       }
     },
   },

src/HManagement/clueManage/clue_private/modules/detail.vue

@@ -20,6 +20,7 @@
         <distobutionOne v-if="tool.checkAuth($route.name,'oneDistribution') && mainData.allocationstatus == '待分配' && mainData.projectname1 === ''" :status="mainData.status"  @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" />
         <recall class="inline-16" v-if="mainData.allocationstatus != '待分配' && mainData.status === '待跟进' || mainData.status === '跟进中' && mainData.isTeam !== '团队' && tool.checkAuth($route.name,'recall')" :data="mainData" @onSuccess="queryMainData"></recall>
         <changeSite v-if="tool.checkAuth($route.name,'changeSite')" class="inline-16"></changeSite>
+        <restore v-if="tool.checkAuth($route.name,'restore')" class="inline-16" @restSuccess="queryMainData" :status="mainData.status"></restore>
       </div>
       <div slot="slot1" class="container normal-panel">
         <BaseInfo :detailInfo="detailInfo"/>
@@ -90,6 +91,7 @@ import distobutionOne from './distobutionOne'
 import FileItem from '@/SManagement/orderclue/components/file/index2'
 import sourceClues from '@/HManagement/clueManage/clue_public/modules/sourceClues'
 import changeSite from '@/HManagement/clueManage/clue_private/modules/changeToSite.vue'
+import restore from './restore.vue'
 export default {
   name: "detail",
   data() {
@@ -131,7 +133,7 @@ export default {
     }
   },
   components:{
-    BaseInfo,recall,edit,distobutionOne,FileItem,sourceClues,changeSite
+    BaseInfo,recall,edit,distobutionOne,FileItem,sourceClues,changeSite,restore
   },
   methods:{
     async followRecord () {

src/HManagement/clueManage/clue_private/modules/restore.vue

@@ -0,0 +1,42 @@
+<template>
+  <div>
+    <el-button  :type="status !== '已过期' ?'':'primary'" size="mini"  @click="onRestore" :disabled="status !== '已过期'">恢复</el-button>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "restore",
+  props:['status'],
+  methods:{
+   onRestore(){
+      this.$confirm('确定恢复该线索吗?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(async () => {
+        const res = await this.$api.requested({
+          "id": "20230907142004",
+          "content": {
+            "sat_orderclueid":this.$route.query.id
+          }
+        })
+        this.tool.showMessage(res,()=>{
+          this.$emit('restSuccess')
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        });
+      });
+
+
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

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

@@ -20,6 +20,7 @@
       <div slot="customOperation">
         <distobutionOne v-if="tool.checkAuth($route.name,'oneDistribution')" :status="mainData.status" @onSuccess="$store.dispatch('changeDetailDrawer',false),$router.back()" class="inline-16" />
         <changeSite v-if="tool.checkAuth($route.name,'changeSite')"  class="inline-16"></changeSite>
+        <restore v-if="tool.checkAuth($route.name,'restore')" class="inline-16" @restSuccess="queryMainData" :status="mainData.status"></restore>
         <!-- <recall v-if="tool.checkAuth($route.name,'recall')" :data="mainData" @onSuccess="queryMainData"></recall> -->
       </div>
       <div slot="slot1" class="container normal-panel">
@@ -90,6 +91,7 @@ import recall from './recall.vue'
 import distobutionOne from './distobutionOne'
 import sourceClues from '@/HManagement/clueManage/clue_public/modules/sourceClues'
 import changeSite from '@/HManagement/clueManage/clue_private/modules/changeToSite.vue'
+import restore from "@/HManagement/clueManage/clue_private/modules/restore";
 export default {
   name: "detail",
   data() {
@@ -136,7 +138,8 @@ export default {
     FileItem,
     distobutionOne,
     sourceClues,
-    changeSite
+    changeSite,
+    restore
   },
   methods:{
     handleSizeChange(val) {

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

@@ -108,6 +108,11 @@
               </multiplePeople>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item label="是否人员sql" prop="issql">
+              <el-checkbox v-model="form.issql" :true-label="1" :false-label="0"></el-checkbox>
+            </el-form-item>
+          </el-col>
           <el-col :span="24">
             <el-form-item label="人员sql查询" prop="sqlstr">
               <el-input type="textarea" v-model="form.sqlstr" placeholder="请输入人员sql查询"></el-input>

src/SDrpManagement/salerPrivatecustomer/detail/customerDetail.vue

@@ -26,7 +26,7 @@
         <share class="inline-16" v-if="tool.checkAuth($route.name,'share') && mainData.sourcepoolname === ''" :disabled="mainData.disabled" :id="mainData.sa_customersid" @onshow="onSuccess" @shareSuccess="onSuccess"></share>
         <toBack class="inline-16" v-if="tool.checkAuth($route.name,'back') && mainData.sa_customerpoolid_source !== 0" :disabled="mainData.disabled" :data="mainData" @backSuccess="onSuccess"></toBack>
         <duplicatesCustomer class="inline-16" v-if="tool.checkAuth($route.name,'queryDuplicates')" :data="mainData"  @onSuccessTag="onSuccessTag"></duplicatesCustomer>
-        <to_void class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" :disabled="mainData.disabled" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
+        <to_void class="inline-16" v-if="tool.checkAuth($route.name,'toVoid')" :id="mainData.sa_customersid" :disabled="mainData.disabled" :data="mainData" @onshow="onSuccess" @toVoidSuccess="onSuccess"></to_void>
         <recovery class="inline-16" v-if="tool.checkAuth($route.name,'recovery') && mainData.sa_customerpoolid_source !== 0 " :data="mainData" @onshow="onSuccess" @backSuccess="onSuccess"></recovery>
       </div>
       <div slot="slot0" >

src/SDrpManagement/salerPrivatecustomer/detail/modules/operation/toVoid.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-button style="width:100%" :type="!disabled ?'':'primary'" size="mini" block  @click="onshow" :disabled="!disabled">作废</el-button>
+    <el-button style="width:100%" :type="!disabled || data.erpagentnum !== '' ?'':'primary'" size="mini" block  @click="onshow" :disabled="!disabled || data.erpagentnum !== ''">作废</el-button>
     <el-dialog title="" :visible.sync="dialogForm" width="25%" append-to-body>
       <div slot="title" style="font-size: 15px">
         作废
@@ -27,7 +27,7 @@
 <script>
 export default {
   name: "toVoid",
-  props:["id","disabled"],
+  props:["id","disabled","data"],
   data(){
     return {
       dialogForm:false,
@@ -70,4 +70,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/SManagement/archives_sc/index.vue

@@ -15,7 +15,7 @@
             <div class="bottom">
               <p class="title">{{item.title}}</p>
               <p class="descript">{{item.notes}}</p>
-              <p class="people">{{item.readcount}}人学习</p>
+              <p class="people">{{item.studypeoplecount}}人学习</p>
             </div>
           </div>
         </div>
@@ -30,7 +30,7 @@
       </div>
     </div>
 </normalLayout>
-  
+
 </template>
 
 <script>
@@ -117,7 +117,7 @@ export default {
       this.list = res.data
       this.param.content.sort = res.sort
       console.log(res);
-      
+
     },
     sortTypeChange (name) {
       for (let i = 0; i < this.param.content.sort.length; i++) {
@@ -136,7 +136,7 @@ export default {
       let res = await this.$api.requested(this.detail)
       this.currentSelectFile = res.data
       console.log(this.currentSelectFile);
-      
+
       this.$nextTick(() => {
         this.$refs.detail.isFileInfoPanlShow = true
       })

src/SManagement/orderclue_detail/components/changeProject.vue

@@ -115,7 +115,7 @@
                     v-model="form.begdate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>
@@ -127,7 +127,7 @@
                     v-model="form.enddate_due"
                     type="month"
                     placeholder="选择月"
-                    :picker-options="pickerOptions"
+
                 >
                 </el-date-picker>
               </el-form-item>