Merge remote-tracking branch 'origin/master'

src/views/modules/cw/workContract/contractRegisitionAddForm/ContractAddForm.vue

@@ -272,6 +272,7 @@
 
       <el-tabs v-model="activeName" type="border-card" @tab-click="tabHandleClick">
         <el-tab-pane label="合同文件" name="contractProper">
+          <span slot="label"><span style="color: red;border-top: 20px">*</span> 合同文件</span>
           <!--        合同文件-->
           <UpLoadComponent ref="uploadComponent"></UpLoadComponent>
         </el-tab-pane>
@@ -793,9 +794,9 @@
               this.inputForm.contractProperList = this.$refs.uploadComponent.getDataList()
               if (this.commonJS.isEmpty(this.inputForm.contractProperList)) {
                 // 附件至少上传一条
-                this.$message.error('至少上传一条附件数据')
+                this.$message.error('至少上传一个附件信息')
                 this.loading = false
-                throw new Error('至少上传一条附件数据')
+                throw new Error('至少上传一个附件信息')
               }
               this.inputForm.fees = this.inputForm.contractFees.join(',')
               this.contractInfoService.save(this.inputForm).then(({data}) => {

src/views/modules/materialManagement/purchase/PurchaseList.vue

@@ -146,8 +146,8 @@
               <el-button v-if="hasPermission('material:edit')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='2'" type="text"  size="small" @click="reback(scope.row)">撤回</el-button>
               <el-button v-if="hasPermission('material:del')&&scope.row.createBy === $store.state.user.id&&(scope.row.status==='1'||scope.row.status==='3')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
               <el-button v-else-if="hasPermission('material:del')&&isAdmin&&(scope.row.status==='1'||scope.row.status==='3'||scope.row.status==='4'||scope.row.status==='5')" type="text"   size="small" @click="del(scope.row.id)">删除</el-button>
-              <el-button v-if="hasPermission('material:wareHouseRecord:list')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='5'&&scope.row.purchaseModeType==='1'" type="text" size="small" @click="seeWareHouse(scope.row.id)">入库记录</el-button>
-              <el-button v-if="hasPermission('material:wareHouse:add')&&scope.row.createBy === $store.state.user.id&&scope.row.status==='5'&&scope.row.purchaseModeType==='1'" type="text" size="small" @click="wareHouse(scope.row.id)">入库</el-button>
+              <el-button v-if="hasPermission('material:wareHouseRecord:list')&&scope.row.status==='5'&&scope.row.purchaseModeType==='1'" type="text" size="small" @click="seeWareHouse(scope.row.id)">入库记录</el-button>
+              <el-button v-if="hasPermission('material:wareHouse:add')&&scope.row.status==='5'&&scope.row.purchaseModeType==='1'" type="text" size="small" @click="wareHouse(scope.row.id)">入库</el-button>
             </template>
           </vxe-column>
         </vxe-table>