Merge remote-tracking branch 'origin/master'

src/layout/components/userbar.vue

@@ -72,9 +72,9 @@
 				</el-dropdown-menu>
 			</template>
 		</el-dropdown>
-<!--		<div class="panel-item hidden-sm-and-down" @click="openSetting">-->
-<!--			<el-icon><MoreFilled style="transform: rotate(90deg)" /></el-icon>-->
-<!--		</div>-->
+		<div class="panel-item hidden-sm-and-down" @click="openSetting">
+			<el-icon><MoreFilled style="transform: rotate(90deg)" /></el-icon>
+		</div>
 		<el-drawer
 			title="新消息"
 			v-model="msg"

src/views/common/UpLoadComponent.vue

@@ -297,6 +297,7 @@
         this.uploadKey = Math.random()
       },
       showFile (row) {
+      	console.log('row', row)
         openWindowOnUrl(row)
       },
       onPreview (url) {

src/views/cw/workContract/ContractRegistration.vue

@@ -861,7 +861,7 @@
       },
       // 纸质归档撤回
       rebackPaperFiled (row) {
-        // console.log('row.taskFiledProcInsId' + row.taskFiledProcInsId)
+        console.log('row.taskFiledProcInsId', row)
         this.$confirm(`确定撤回流程吗?`, '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',

src/views/dashboard/widgets/index.vue

@@ -5,7 +5,7 @@
 	>
 		<div class="widgets-content">
 			<div class="widgets-top">
-				<div class="widgets-top-actions">
+				<div class="widgets-top-actions" style="display: none">
 					<el-button
 						v-if="customizing"
 						icon="el-icon-check"

src/views/finance/invoice/InvoiceForm.vue

@@ -542,6 +542,7 @@
 					style="margin-left: 5em"
 					@cell-click=""
 					@edit-closed=""
+					:key="detailKey2"
 					highlight-current-row
 					:edit-config="{trigger: 'click', mode: 'row', showStatus: true, autoClear: true, icon: '#'}"
 				>
@@ -661,6 +662,7 @@
         receivablesFlag: '', // true为收款，false为非收款
         detailFlag: '', // true为修改发票明细
         importVisible: false,
+		  detailKey2: '',
         yesNoFlag: [{label: '否', value: '0'}, {label: '是', value: '1'}]
       }
     },
@@ -953,6 +955,7 @@
         if (type === 'receivables') {
           this.$refs.receivablesTable.insert().then((data) => {
             this.inputForm.financeInvoiceReceivablesDTOList.push(data)
+			  this.detailKey2  = Math.random()
           })
         }
       },

src/views/finance/invoice/InvoiceFormTask.vue

@@ -355,7 +355,7 @@
                 label: 'name',         // 显示名称
                 children: 'children'    // 子级字段名
               }"
-              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
+              :url="`/system-server/sys/user/treeUserDataAccessOffice?type=2`"
               :value="inputForm.reconciliationPeople"
               :clearable="true"
               :accordion="true"

src/views/flowable/task/TaskForm.vue

@@ -1138,7 +1138,7 @@ export default {
 					this.inputForm.noticeName = data[0].assigneeName
 					// 通知人Id
 					this.inputForm.noticeId = data[0].assigneeId
-					noticeService.addInfo(this.inputForm)
+					// noticeService.addInfo(this.inputForm)
 				}
 			})
 		},

src/views/materialManagement/supplier/SupplierList.vue

@@ -59,7 +59,7 @@
           <vxe-column min-width="230" align="center" title="联系电话" field="telPhone"></vxe-column>
           <vxe-column min-width="230" align="center" title="地址" field="address"></vxe-column>
           <vxe-column min-width="130" align="center" title="创建人" field="createName"></vxe-column>
-          <vxe-column min-width="200" align="center" title="创建时间" field="createDate"></vxe-column>
+          <vxe-column min-width="200" align="center" title="创建时间" field="createTime"></vxe-column>
           <vxe-column title="操作" width="150px" fixed="right" align="center">
             <template  #default="scope">
               <el-button v-if="(hasPermission('material:supplier:edit')&&$store.state.user.id === scope.row.createBy.id) || isAdmin" text type="primary"  size="small" @click="edit(scope.row.id)">修改</el-button>

src/views/program/registered/RegisItemForm.vue

@@ -318,7 +318,7 @@
                   label: 'name',         // 显示名称
                   children: 'children'    // 子级字段名
                 }"
-                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"
+                :url="`/system-server/sys/user/treeUserDataAccessOffice?type=2`"
                 :value="inputForm.projectManager"
                 :clearable="true"
                 :accordion="true"

src/views/utils/treeUserSelect.vue

@@ -1,5 +1,5 @@
 <template>
-  <el-select v-model="valueTitle" :size="size"  :disabled="disabled" :clearable="clearable" :placeholder="placeholderText" @clear="clearHandle">
+  <el-select ref="selectCom" v-model="valueTitle" :size="size"  :disabled="disabled" :clearable="clearable" :placeholder="placeholderText" @clear="clearHandle">
     <el-option :value="valueTitle"  :label="valueTitle" class="options">
       <el-tree  id="tree-option"
         ref="selectTree"
@@ -189,6 +189,7 @@ export default {
       this.valueTitle = node[this.props.label]
       this.valueId = node[this.props.value]
       this.$emit('getValue', this.valueId, this.valueTitle, node)
+		this.$refs.selectCom.blur()
     },
     handleCheckChange (data, checked, indeterminate) {
       let nodes = this.$refs.selectTree.getCheckedNodes()
@@ -199,6 +200,7 @@ export default {
         return node[this.props.value]
       }).join(',')
       this.$emit('getValue', this.valueId, this.valueTitle)
+		this.$refs.selectCom.blur()
     },
     // 清除选中
     clearHandle () {
@@ -207,6 +209,7 @@ export default {
       this.defaultExpandedKey = []
       this.clearSelected()
       this.$emit('getValue', null, null, null)
+		this.$refs.selectCom.blur()
     },
     /* 清空选中样式 */
     clearSelected () {