From 5cea3c22f23ce9f8963b6e3fd8601361c092480f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E4=B8=96=E5=BC=BA?= <vayne0702@163.com>
Date: Tue, 4 Apr 2023 11:16:13 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SC-web/src/views/extend/paymentdoc/form.vue   | 71 ++++++++++---------
 .../purchaseorder/receiptinForm.vue           | 13 +++-
 .../scm/basicInformation/receiptin/Form.vue   | 29 +++++---
 .../scm/basicInformation/receiptout/Form.vue  | 12 ++--
 4 files changed, 74 insertions(+), 51 deletions(-)

diff --git a/SC-web/src/views/extend/paymentdoc/form.vue b/SC-web/src/views/extend/paymentdoc/form.vue
index 92d4632b..6b3a3ca0 100644
--- a/SC-web/src/views/extend/paymentdoc/form.vue
+++ b/SC-web/src/views/extend/paymentdoc/form.vue
@@ -1,13 +1,13 @@
 <template>
 	<div>
 		<el-row :gutter="15">
-			<el-form ref="elForm" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
-				label-position="right" :disabled="setting.readonly">
+			<el-form  ref="elForm" :model="dataForm" :rules="dataRule" size="small" label-width="100px"
+				label-position="right"  aria-disabled="true">
 				<template v-if="!loading && formOperates">
 					<el-col :span="6" v-if="judgeShow('documentNo')">
 						<el-form-item label="单据编号" prop="documentNo">
 							<el-input :disabled="judgeWrite('documentNo')" v-model="dataForm.documentNo"
-								placeholder="系统自动生成" readonly>
+								placeholder="系统自动生成" disabled >
 
 							</el-input>
 						</el-form-item>
@@ -18,7 +18,7 @@
 							<popupSelect v-model="dataForm.supplierId" placeholder="请选择" clearable field="supplierId"
 								interfaceId="389674191453990661" :columnOptions="supplierIdcolumnOptions"
 								propsValue="id" relationField="supplier_name" popupType="dialog" popupTitle="选择数据"
-								popupWidth="800px" hasPage :pageSize="20" disabled>
+								popupWidth="800px" hasPage :pageSize="20" :disabled="true">
 
 							</popupSelect>
 						</el-form-item>
@@ -29,7 +29,7 @@
 							<el-select :disabled="judgeWrite('paymentType')" v-model="dataForm.paymentType"
 								placeholder="请选择" clearable :style='{"width":"100%"}'>
 								<el-option v-for="(item, index) in paymentTypeOptions" :key="index"
-									:label="item.fullName" :value="item.id" :disabled="item.disabled"></el-option>
+									:label="item.fullName" :value="item.id" :disabled="item.disabled" disabled></el-option>
 
 							</el-select>
 						</el-form-item>
@@ -104,7 +104,7 @@
 					<el-col :span="6" v-if="judgeShow('collectionAccount')">
 						<el-form-item label="收款账户" prop="collectionAccount">
 							<el-input :disabled="judgeWrite('collectionAccount')" v-model="dataForm.collectionAccount"
-								placeholder="请输入" clearable :style='{"width":"100%"}'>
+								placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
 
 							</el-input>
 						</el-form-item>
@@ -113,7 +113,7 @@
 					<el-col :span="6" v-if="judgeShow('colectionBank')">
 						<el-form-item label="收款银行" prop="colectionBank">
 							<el-input :disabled="judgeWrite('colectionBank')" v-model="dataForm.colectionBank"
-								placeholder="请输入" clearable :style='{"width":"100%"}'>
+								placeholder="请输入" clearable :style='{"width":"100%"}' readonly>
 
 							</el-input>
 						</el-form-item>
@@ -192,7 +192,7 @@
 													<el-input v-model="scope.row.amount"
 											   :disabled="judgeWrite('paymentdocitem0List') || judgeWrite('paymentdocitem0List-amount')"
 														placeholder="请输入" clearable :style='{"width":"100%"}'
-														@change="amountChange(scope.row)">
+														@change="amountChange(scope.row)" readonly>
 													</el-input>
 												</template>
 											</el-table-column>
@@ -201,7 +201,7 @@
 													订单金额
 												</template>
 												<template slot-scope="scope">
-													<el-input v-model="scope.row.allAmount" placeholder="请输入" clearable
+													<el-input  class="rt-input" v-model="scope.row.allAmount" placeholder="请输入" clearable
 														:style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
@@ -362,7 +362,7 @@
 												width="250">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.purchaseorderNo" placeholder="请输入"
-														clearable :style='{"width":"100%"}' :disabled="true">
+														clearable :style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
@@ -370,7 +370,7 @@
 												:disabled="true">
 												<template slot-scope="scope">
 													<el-select v-model="scope.row.isPay" placeholder="请选择" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' disabled>
 														<el-option v-for="(item, index) in advanceOptions" :key="index"
 															:label="item.fullName" :value="item.id"
 															:disabled="item.disabled"></el-option>
@@ -380,14 +380,14 @@
 											<el-table-column prop="vehicleName" label="车辆" align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.vehicleName" placeholder="请输入"
-														clearable :style='{"width":"100%"}' :disabled="true">
+														clearable :style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
 											<el-table-column prop="materialName" label="物料" align="center" width="180">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.materialName" placeholder="请输入"
-														clearable :style='{"width":"100%"}' :disabled="true">
+														clearable :style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
@@ -404,24 +404,24 @@
 											<el-table-column prop="poundType" label="磅单类型" align="center" width="130">
 												<template slot-scope="scope">
 													<el-select v-model="scope.row.poundType" placeholder="请选择" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 														<el-option v-for="(item, index) in poundTypeOptions"
 															:key="index" :label="item.fullName" :value="item.id"
-															:disabled="item.disabled"></el-option>
+															:disabled="item.disabled" disabled></el-option>
 													</el-select>
 												</template>
 											</el-table-column>
 											<el-table-column prop="netWeight" label="净重" align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.netWeight" placeholder="请输入" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
 											<el-table-column prop="unit" label="单位" align="center" width="130">
 												<template slot-scope="scope">
 													<el-select v-model="scope.row.unit" placeholder="请选择" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 														<el-option v-for="(item, index) in unitOptions" :key="index"
 															:label="item.fullName" :value="item.id"
 															:disabled="item.disabled"></el-option>
@@ -432,7 +432,7 @@
 												:disabled="true">
 												<template slot-scope="scope">
 												 <el-select v-model="scope.row.advance" placeholder="请选择" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 														<el-option v-for="(item, index) in advanceOptions" :key="index"
 															:label="item.fullName" :value="item.id"
 															:disabled="item.disabled"></el-option>
@@ -442,45 +442,45 @@
 											<el-table-column prop="purchasePrice" label="单价" align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.purchasePrice" placeholder="请输入" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
 											<el-table-column prop="settlement" label="结算重量 " align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.settlement" placeholder="请输入" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 												 </el-input>
 												</template>
 											</el-table-column>
 											<el-table-column prop="rate" label="税率 " align="center" width="130">
 												<template slot-scope="scope">
 													<el-select v-model="scope.row.rate" placeholder="请选择" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 														<el-option v-for="(item, index) in rateOptions" :key="index"
 															:label="item.fullName" :value="item.id"
-															:disabled="item.disabled"></el-option>
+															:disabled="item.disabled" disabled></el-option>
 													</el-select>
 												</template>
 											</el-table-column>
 											<el-table-column prop="amount" label="金额" align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.amount" placeholder="请输入" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
 											<el-table-column prop="notAmount" label="不含税金额" align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.notAmount" placeholder="请输入" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
 											<el-table-column prop="remark" label="备注" align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.remark" placeholder="请输入" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
@@ -547,7 +547,7 @@
 												width="250">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.documentno" placeholder="请输入"
-														clearable :style='{"width":"100%"}' :disabled="true">
+														clearable :style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
@@ -569,7 +569,7 @@
 												width="150">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.paymentamount" placeholder="请输入"
-														clearable :style='{"width":"100%"}' :disabled="true">
+														clearable :style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
@@ -577,24 +577,24 @@
 												width="130">
 												<template slot-scope="scope">
 													<el-select v-model="scope.row.settlementtype" placeholder="请选择" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 														<el-option v-for="(item, index) in settlementTypeOptions"
 															:key="index" :label="item.fullName" :value="item.id"
-															:disabled="item.disabled"></el-option>
+															:disabled="item.disabled" disabled></el-option>
 													</el-select>
 												</template>
 											</el-table-column>
 											<el-table-column prop="remark" label="备注" align="center">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.remark" placeholder="请输入" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
 											<el-table-column prop="creatorUserName" label="付款人" align="center" width="130">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.creatorUserName" placeholder="请输入" clearable
-														:style='{"width":"100%"}' :disabled="true">
+														:style='{"width":"100%"}' readonly>
 													</el-input>
 												</template>
 											</el-table-column>
@@ -620,8 +620,9 @@
 	import {
 		getDictionaryDataSelector
 	} from '@/api/systemData/dictionary'
+  import StyleScript from '@/components/Generator/index/StyleScript'
 	export default {
-		components: {},
+		components: { StyleScript },
 		props: [],
 		data() {
 			return {
@@ -1211,9 +1212,9 @@
 		},
 	}
 </script>
-
 <style lang="scss" scoped>
-  .el-input.is-disabled {
-    color: #606266;
+  .rt-input.el-input__inner {
+    color: red !important;
+    cursor: pointer;
   }
 </style>
diff --git a/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue b/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue
index cde012ff..9d60ad14 100644
--- a/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue
+++ b/SC-web/src/views/scm/basicInformation/purchaseorder/receiptinForm.vue
@@ -331,7 +331,18 @@
 					receiptin_item0List: [],
 				},
 				activevpzhms: '0',
-				rules: {},
+				rules: {
+          reservoirareaName: [{
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }],
+          warehouseName: [{
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }],
+        },
 				typeOptions: [{
 					"fullName": "采购入库",
 					"id": "0"
diff --git a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
index 6521fadc..e4a9eb93 100644
--- a/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptin/Form.vue
@@ -151,14 +151,14 @@
 													</popupSelect>
 												</template>
 											</el-table-column>
-											<el-table-column prop="reservoirareaId" width="200" label="库区">
+											<el-table-column prop="reservoirareaName" required width="200" label="库区">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.reservoirareaName" placeholder="选择库区"
 														readonly @click.native="choiceReservoirareaId(scope.$index)">
 													</el-input>
 												</template>
 											</el-table-column>
-											<el-table-column prop="warehouseId" width="200" label="仓库">
+											<el-table-column prop="warehouseName" required width="200" label="仓库">
 												<template slot-scope="scope">
 													<el-input v-model="scope.row.warehouseName" placeholder="选择库区"
 														readonly>
@@ -292,7 +292,18 @@
 					receiptin_item0List: [],
 				},
 				activevpzhms: '0',
-				rules: {},
+				rules: {
+          reservoirareaName: [{
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }],
+          warehouseName: [{
+            required: true,
+            message: '请选择',
+            trigger: 'change'
+          }],
+        },
 				typeOptions: [{
 					"fullName": "采购入库",
 					"id": "0"
@@ -458,19 +469,19 @@
 		mounted() {},
 		methods: {
 			initData(reservoirarea) {
-				for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
+				for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) {
 					if (this.comIndex == 0) {
-						this.dataForm.receiptout_item0List.forEach((column, index) => {
+						this.dataForm.receiptin_item0List.forEach((column, index) => {
 							column.reservoirareaId = reservoirarea.id;
 							column.warehouseId = reservoirarea.houseId;
 							column.reservoirareaName = reservoirarea.areaname;
 							column.warehouseName = reservoirarea.houseName;
 						});
 					} else {
-						this.dataForm.receiptout_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
-						this.dataForm.receiptout_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
-						this.dataForm.receiptout_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
-						this.dataForm.receiptout_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
+						this.dataForm.receiptin_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
+						this.dataForm.receiptin_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
+						this.dataForm.receiptin_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
+						this.dataForm.receiptin_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
 					}
 				}
 			},
diff --git a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
index 8433fcf5..181f60a6 100644
--- a/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
+++ b/SC-web/src/views/scm/basicInformation/receiptout/Form.vue
@@ -324,19 +324,19 @@
         mounted() {},
         methods: {
           initData(reservoirarea) {
-            for (let i = 0; i < this.dataForm.receiptin_item0List.length; i++) {
+            for (let i = 0; i < this.dataForm.receiptout_item0List.length; i++) {
               if (this.comIndex == 0) {
-                this.dataForm.receiptin_item0List.forEach((column, index) => {
+                this.dataForm.receiptout_item0List.forEach((column, index) => {
                   column.reservoirareaId = reservoirarea.id;
                   column.warehouseId = reservoirarea.houseId;
                   column.reservoirareaName = reservoirarea.areaname;
                   column.warehouseName = reservoirarea.houseName;
                 });
               } else {
-                this.dataForm.receiptin_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
-                this.dataForm.receiptin_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
-                this.dataForm.receiptin_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
-                this.dataForm.receiptin_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
+                this.dataForm.receiptout_item0List[this.comIndex].reservoirareaId = reservoirarea.id;
+                this.dataForm.receiptout_item0List[this.comIndex].warehouseId = reservoirarea.houseId;
+                this.dataForm.receiptout_item0List[this.comIndex].reservoirareaName = reservoirarea.areaname;
+                this.dataForm.receiptout_item0List[this.comIndex].warehouseName = reservoirarea.houseName;
               }
             }
           },