修改

src/views/auxiliaryFittings/attachmentProfile/index.vue

@@ -24,6 +24,7 @@ import ImageUpload from '@/components/file-upload'
 import { downloadFiles } from '@/utils/util'
 import { required, mobileRequired, mobile, httpUrl, email } from '@/components/template/rules_verify.js'
 import { listPageV2,pageExport, getDetail, add, edit, updateStatus, listImport, getTypeList, getCategoryList } from "@/api/auxiliaryFittings/attachmentProfile";
+import { getBrand } from '@/api/goods'
 export default {
   components: { TemplatePage, ImageUpload },
   mixins: [import_mixin],
@@ -232,8 +233,8 @@ export default {
         md: 24,
         isShow: this.formData.normType == 'M'?true:false,
         name: 'el-checkbox-add',
-		labelKey: 'dictValue',
-		valueKey: 'dictCode',
+		labelKey: 'brandName',
+		valueKey: 'brandName',
         attributes: {},
 		options: this.brandList,
         formItemAttributes: {
@@ -511,6 +512,11 @@ export default {
 		   this[type] = res.data.records
 		})
 	},
+	getBrand(){
+		getBrand().then(res => {
+			this.brandList = res.data
+		})
+	},
 	getCategoryList(){
 		getCategoryList({"type":2}).then(res => {
 		   this.categoryList = res.data
@@ -575,7 +581,8 @@ export default {
     },
     openForm() {
 	  this.getTypeList('PARTS_UNIT','partsUnitList')
-	  this.getTypeList('BRAND','brandList')
+	  // this.getTypeList('BRAND','brandList')
+	  this.getBrand()
 	  this.getCategoryList()
       this.formDialog = true;
     },

src/views/mallManagement/goods/goods_add/index.vue

@@ -29,7 +29,7 @@
 			      v-for="item in orderTypeList"
 			      :key="item.id"
 			      :label="item.orderSmallTypeText"
-			      :value="item.orderSmallTypeText">
+			      :value="item.id">
 			    </el-option>
 			</el-select>
 		</el-form-item>

src/views/workOrder/basicConfiguration/assessmentItemAllocation/index.vue

@@ -82,7 +82,7 @@ export default {
         md: 24,
         isShow: true,
         name: 'el-input',
-        attributes: { placeholder: '请输入供应商名称', },
+        attributes: { placeholder: '请输入考核项目名称', },
         formItemAttributes: {
           label: '考核项目',
           prop: 'name',

src/views/workOrder/settleAccountsManagement/rewardsPunishmentsOrder/index.vue

@@ -249,7 +249,7 @@ export default {
 			md: 12,
 			isShow: true,
 			name: 'el-input',
-			attributes: { placeholder: '请输入', type: 'number'},
+			attributes: { placeholder: '请输入'},
 			formItemAttributes: {
 				label: '关联工单号',
 				prop: 'orderBaseId',
@@ -317,6 +317,8 @@ export default {
 				websit: {websitId: row.websitId,websitName: row.websitName},
 				examineProject: {name: row.examineProjectName}
 		      })
+			  this.getExamine()
+			  this.getWebsit()
 			  this.getWorker()
 		      this.formDialogType = 2
 		      this.openForm()

src/views/workOrder/settleAccountsManagement/summaryBill/detailList.vue

@@ -14,11 +14,11 @@
 					</el-col>
 					<el-col :span="6">
 						<el-form-item label="工单类型" prop="orderSmallType">
-							<el-select v-model="screenForm.team_id" filterable placeholder="请选择工单类型">
+							<el-select v-model="screenForm.orderSmallType" filterable placeholder="请选择工单类型">
 							   <el-option
-							     v-for="item in teamList"
+							     v-for="item in orderTypeList"
 							     :key="item.id"
-							     :label="item.name"
+							     :label="item.orderSmallTypeText"
 							     :value="item.id">
 							   </el-option>
 							</el-select>
@@ -131,7 +131,7 @@
 			<el-table-column prop="remark" align="center" label="备注"></el-table-column>
 			<el-table-column label="操作" align="center" width="80" fixed="right">
 				<template slot-scope="scope">
-					<el-button type="text" style="color: #FF0000" @click="cancel(scope.row.id)">驳回</el-button>
+					<el-button type="text" style="color: #FF0000" @click="cancel(scope.row.orderId,scope.row.poolId)">驳回</el-button>
 				</template>
 			</el-table-column>
 		</el-table>
@@ -140,12 +140,14 @@
 
 <script>
 	import { listPageV2,pageExport, cancel } from "@/api/workOrder/summaryBillDetail";
+	import { getTypeList } from "@/api/workOrder/settlementStandardInstall";
 	import { downloadFiles2 } from "@/utils/util.js";
 	export default {
 		props: ['id','title'],
 		data() {
 			return {
 				dataList: [],
+				orderTypeList: [],
 				cellList: [], // 单元格数组
 				count: null, // 计数
 				screenForm: {
@@ -165,12 +167,18 @@
 			if(this.id){
 				this.getList()
 			}
+			this.getTypeList()
 		},
 		methods: {
 			// 返回
 			goBack() {
 				this.$emit('back');
 			},
+			getTypeList(){
+				getTypeList({pageNum: 1,pageSize: -1,params: [{param: 'a.order_type',compare: '=',value: 'INSTALL'},{param: 'a.status',compare: '=',value: true}]}).then(res => {
+					this.orderTypeList = res.data.records
+				})
+			},
 			derive(){
 				downloadFiles2('settle/order/export/pool/detail',{
 					id: this.id,
@@ -202,13 +210,13 @@
 					this.computeCell(this.dataList)
 				})
 			},
-			cancel(id){
+			cancel(id,poolId){
 				this.$confirm(`请确定是否驳回该数据, 是否继续?`, '提示', {
 					confirmButtonText: '确定',
 					cancelButtonText: '取消',
 					type: 'warning'
 				}).then(() => {
-					cancel([id]).then(res => {
+					cancel({ids: [id],poolId}).then(res => {
 						if(res.code == 200){
 							this.$message.success('审核成功！')
 							this.goBack()

src/views/workOrder/settleAccountsManagement/summaryBill/index.vue

@@ -173,10 +173,10 @@ export default {
 					this.formDialog = true
 				}}>明细</el-button>
 				{row.status == 'NO'?<el-button type="text" onClick={() => {
-					this.confirm(row.id)
+					this.confirm([row.id])
 				}}>发放</el-button>:null}
 				{row.status == 'NO'?<el-button type="text" onClick={() => {
-					this.cancel(row.id)
+					this.cancel([row.id])
 				}}>驳回</el-button>:null}
 			</div>
 		)
@@ -185,7 +185,7 @@ export default {
 		if(this.recordSelected.length == 0){
 			return this.$message.warning('请至少勾选一条数据！');
 		}
-		this.cancel(this.recordSelected.map(item=>{return item.id}).join(','))
+		this.cancel(this.recordSelected.map(item=>{return item.id}))
 	},
     cancel(ids) {
 		this.$confirm('请确认是否驳回选中的数据, 是否继续?', '提示', {
@@ -193,7 +193,7 @@ export default {
 			cancelButtonText: '取消',
 			type: 'warning'
 		}).then(() => {
-			cancel([ids]).then(res => {
+			cancel(ids).then(res => {
 				this.$message({ type: 'success', message: `驳回成功!` })
 				this.$refs.pageRef.refreshList()
 			})
@@ -203,7 +203,7 @@ export default {
 		if(this.recordSelected.length == 0){
 			return this.$message.warning('请至少勾选一条数据！');
 		}
-		this.confirm(this.recordSelected.map(item=>{return item.id}).join(','))
+		this.confirm(this.recordSelected.map(item=>{return item.id}))
 	},
 	confirm(ids){
 		this.$confirm('请确认是否发放选中的数据, 是否继续?', '提示', {
@@ -211,7 +211,7 @@ export default {
 			cancelButtonText: '取消',
 			type: 'warning'
 		}).then(() => {
-			confirm([ids]).then(res => {
+			confirm(ids).then(res => {
 				this.$message({ type: 'success', message: `发放成功!` })
 				this.$refs.pageRef.refreshList()
 			})