流程调整

src/api/sys/OSSService.js

@@ -73,8 +73,8 @@ export default class OSSSerive {
 
 export const client = new OSS({
   region: 'oss-cn-hangzhou', // oss地址
-  accessKeyId: 'LTAI5tQDWoM9c1WyJNPs86rX', // 通过阿里云控制台创建的AccessKey ID。
-  accessKeySecret: '84dDIx4edT1n78KUOqqSmDZ35pchJv', // 通过阿里云控制台创建的AccessKey Secret。
+	accessKeyId: 'LTAI5tKa6kzGr5EyPWJB4EcD', // 通过阿里云控制台创建的AccessKey ID。
+	accessKeySecret: 'arHxB7ZPhizrBYf4844TtyaRctPMgW', // 通过阿里云控制台创建的AccessKey Secret。
   bucket: 'xgxm-test', // 仓库名字
 	// bucket: 'xg-pg', // 仓库名字
   useFetch: true, // 支持上传大于100KB的文件

src/views/common/InscriptionUpLoadComponent.vue

@@ -378,6 +378,7 @@
 						}
 					}
 				}
+				this.$emit('updateSealType',this.dataListNew)
 			},
 			async success(res, file,fileList) {
 				if(file.url){

src/views/jy/drive/DriveAccountForm.vue

@@ -309,7 +309,7 @@
 								method = 'view'
 							}
 							console.log('me',method)
-							this.$refs.uploadComponent.newUpload(method, this.inputForm.files, 'driveApply',null,null,null,null,null)
+							this.$refs.uploadComponent.newUpload('view', this.inputForm.files, 'driveApply',null,null,null,null,null)
 							this.$refs.upLoadComponentAccount.newUpload(method, this.inputForm.accountFiles, 'driveAccount',null,null,null,null,null)
 							this.loading = false
 						})

src/views/jy/finance/InvoiceList.vue

@@ -244,12 +244,12 @@
               {{$dictUtils.getDictLabel('collect_not', scope.row.receivablesStatus, '')}}
             </template>
           </vxe-column>
-          <vxe-column min-width="110"  align="center" title="是否作废" field="invalidStatus">
-            <template #default="scope">
-              {{scope.row.invalidStatus === '1'?'已作废':'未作废'}}
-            </template>
+<!--          <vxe-column min-width="110"  align="center" title="是否作废" field="invalidStatus">-->
+<!--            <template #default="scope">-->
+<!--              {{scope.row.invalidStatus === '1'?'已作废':'未作废'}}-->
+<!--            </template>-->
 
-          </vxe-column>
+<!--          </vxe-column>-->
           <vxe-column  min-width="115"  align="center" title="状态" field="status" >
             <template #default="scope">
               <el-button @click="invoiceDetail(scope.row)" :type="$dictUtils.getDictLabel('invoice_status_info', scope.row.status, '')" effect="dark" >{{$dictUtils.getDictLabel("invoice_status", scope.row.status, '')}} </el-button>
@@ -268,7 +268,7 @@
               <el-button v-if="hasPermission('cw_finance:invoice:edit:receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1' &&scope.row.createById === $store.state.user.id" text type="primary"  @click="view(true, scope.row)">收款</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit:is_receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus !== '1'" text type="primary"  @click="isReceivables(scope.row)">确认收款</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit:is_receivables')&&scope.row.status === '5'&&scope.row.receivablesStatus === '1' &&scope.row.createById === $store.state.user.id" text type="primary" @click="recallReceivables(scope.row)">撤回收款</el-button>
-              <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '5'||scope.row.status === '7')" text type="primary"  @click="invoiceInvalidPush(scope.row)">作废</el-button>
+<!--              <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '5'||scope.row.status === '7')" text type="primary"  @click="invoiceInvalidPush(scope.row)">作废</el-button>-->
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&scope.row.status === '6'" text type="primary" @click="invoiceInvalidReBack(scope.row)">作废撤回</el-button>
               <el-button v-if="hasPermission('cw_finance:invoice:edit')&&scope.row.createBy.id === $store.state.user.id&&(scope.row.status === '1'||scope.row.status === '3')" text type="primary"  @click="del(scope.row.id)">删除</el-button>
 <!--              审核  发票申请-->

src/views/jy/notify/NotifyTaskForm.vue

@@ -442,7 +442,7 @@
 			console.log("进入方法是")
 			await this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((da)=>{
 				if (this.commonJS.isNotEmpty(da)) {
-					if (da === '办公室审核') {
+					if (da === '总经理审核') {
 						this.inputForm.status = '5'
 					}else{
 						this.inputForm.status = '2'

src/views/jy/workContractInfo/ContractAddForm.vue

@@ -741,22 +741,58 @@
         })
       },
        getWorkClientChoose2 (list) {
-	      this.inputForm.primaryLinkman = list.name
-          this.inputForm.customerNo = list.no
-          this.inputForm.uscCode = list.uscCode
-          this.inputForm.address = list.address
-          this.inputForm.customerId = list.id
-          this.inputForm.clientContactsPhone = list.mobile
-		   const wait = function () {
+		   console.log('list',list)
+		   let _this = this
+		   // eslint-disable-next-line no-unused-vars
+		   let _list = list
+		   let _num = 0
+		   if (this.commonJS.isEmpty(this.inputForm.cwWorkClientContactDTOList)) {
+			   this.inputForm.cwWorkClientContactDTOList = []
+		   }
+		   const waitForEach = function () {
 			   return new Promise(function (resolve, reject) {
-				   setTimeout(() => {
+				   if (_this.commonJS.isEmpty(_this.inputForm.cwWorkClientContactDTOList)) {
 					   resolve()
-				   }, 100)
+				   } else {
+					   _this.inputForm.cwWorkClientContactDTOList.forEach((client, index) => {
+						   if (_this.inputForm.customerNo === client.no) {
+							   _this.$refs.contactTable.remove(client)
+							   _this.inputForm.cwWorkClientContactDTOList.splice(index, 1)
+						   }
+					   })
+					   setTimeout(() => {
+						   resolve()
+					   }, 400)
+				   }
 			   })
 		   }
-		   wait().then(() => {
+		   waitForEach().then(() => {
+			   this.inputForm.primaryLinkman = list.name
+			   this.inputForm.customerNo = list.number
+			   this.inputForm.uscCode = list.uscCode
+			   this.inputForm.address = list.registerAddress
+			   this.inputForm.customerId = list.id
+			   this.inputForm.clientContactsPhone = list.mobile
+			   const wait = function () {
+				   return new Promise(function (resolve, reject) {
+					   _this.inputForm.cwWorkClientContactDTOList.forEach(client => {
+						   if (_list.no === client.no) {
+							   _num = 1
+						   }
+					   })
+					   setTimeout(() => {
+						   resolve()
+					   }, 100)
+				   })
+			   }
+			   wait().then(() => {
+				   if (_num === 0) {
+					   this.inputForm.cwWorkClientContactDTOList.push({number: list.number, name: list.name})
+					   this.$refs.contactTable.insertAt({name: list.name,id: list.id,number: list.number})
+					   this.tableKeyClient = Math.random()
+				   }
+			   })
 		   })
-		  console.log('1231312',this.inputForm.primaryLinkman)
       },
       // 表单提交
       // 暂存

src/views/materialManagement/collect/CollectForm.vue

@@ -560,7 +560,7 @@
             this.inputForm.files = this.$refs.uploadComponent.getDataList()
             this.commonApi.getTaskNameByProcInsId(this.inputForm.procInsId).then((data) => {
               if (this.commonJS.isNotEmpty(data)) {
-                if (data === '仓库管理员审核') {
+                if (data === '物品管理员审核') {
                   this.inputForm.status = '5'
                 }
               }