Browse Source

前端bug调整

wangqiang 1 year ago
parent
commit
39659debec

+ 43 - 27
src/views/cw/invoice/InvoiceForm.vue

@@ -9,7 +9,7 @@
       @close="close"
       @keyup.enter.native="doSubmit"
       v-model="visible">
-      <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="method==='view'"
+      <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"
                label-width="160px" @submit.native.prevent>
         <el-divider content-position="left"><i class="el-icon-document"></i>
           基本信息
@@ -32,17 +32,17 @@
 			  >
 				  <vxe-table-column field="programName" title="项目名称" :edit-render="{}">
 					  <template v-slot:edit="scope">
-						  <el-input @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :readonly="true" v-model="scope.row.programName"/>
+						  <el-input @focus="openProgramPageForm(scope.$rowIndex)" placeholder="请填写项目名称" :disabled="method==='view'" :readonly="true" v-model="scope.row.programName"/>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="contractName" title="合同名称" :edit-render="{}">
 					  <template v-slot:edit="scope">
-						  <el-input @focus="openContractForm()" placeholder="请填写合同名称" :readonly="true" v-model="scope.row.contractName"/>
+						  <el-input @focus="openContractForm()" placeholder="请填写合同名称" :disabled="method==='view'" :readonly="true" v-model="scope.row.contractName"/>
 					  </template>
 				  </vxe-table-column>
 				  <vxe-table-column field="programNo" title="项目编号" :edit-render="{}">
 					  <template v-slot:edit="scope">
-						  <el-input :readonly="true" placeholder="请填写项目编号" v-model="scope.row.programNo"/>
+						  <el-input :readonly="true" :disabled="method==='view'" placeholder="请填写项目编号" v-model="scope.row.programNo"/>
 					  </template>
 				  </vxe-table-column>
 				  <!--            <vxe-table-column field="clientName" title="委托方" :edit-render="{}">-->
@@ -57,7 +57,7 @@
 				  <!--            </vxe-table-column>-->
 				  <vxe-table-column title="操作" width="100">
 					  <template v-slot="scope">
-						  <el-button type="danger" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
+						  <el-button type="danger" :disabled="method==='view'" @click="removeEvent(scope.row,scope.$rowIndex,'base')">删除</el-button>
 					  </template>
 				  </vxe-table-column>
 			  </vxe-table>
@@ -70,7 +70,7 @@
                           :rules="[
                           {required: true, message:'发票类型不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.type" v-for="item in $dictUtils.getDictList('invoice_type')" :label="item.value" style="margin-right: 20px">
+              <el-radio v-model="inputForm.type" :disabled="method==='view'" v-for="item in $dictUtils.getDictList('invoice_type')" :label="item.value" style="margin-right: 20px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -86,7 +86,7 @@
                           :rules="[
                           {required: true, message:'开票类型不能为空', trigger:'blur'}
                  ]">
-              <el-radio v-model="inputForm.billingType" @change="changeRadio" v-for="item in $dictUtils.getDictList('invoice_billing_type')" :label="item.value" style="margin-right: 20px">
+              <el-radio v-model="inputForm.billingType" :disabled="method==='view'" @change="changeRadio" v-for="item in $dictUtils.getDictList('invoice_billing_type')" :label="item.value" style="margin-right: 20px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -109,6 +109,7 @@
                 :value="inputForm.name"
                 :clearable="true"
                 :accordion="true"
+				:disabled="method==='view'"
                 @getValue="(value) => {inputForm.name=value}"/>
             </el-form-item>
           </el-col>
@@ -119,7 +120,7 @@
                           :rules="[
                           {required: true, message:'实际开票单位不能为空', trigger:'blur'},{required: true, message:'实际开票单位不能为空', trigger:'change'}
                  ]">
-              <el-input :readonly="true" placeholder="请填写实际开票单位" v-model="inputForm.billingWorkplaceReal" @focus="openWorkClientForm()" clearable></el-input>
+              <el-input :readonly="true" :disabled="method==='view'" placeholder="请填写实际开票单位" v-model="inputForm.billingWorkplaceReal" @focus="openWorkClientForm()" clearable></el-input>
             </el-form-item>
           </el-col>
           <template v-if="inputForm.type === '1'" style="width: 100%;">
@@ -128,7 +129,7 @@
                             :rules="[
                         {required: true, message:'纳税人识别号不能为空', trigger:'blur'},{required: true, message:'纳税人识别号不能为空', trigger:'change'}
                ]">
-                <el-input v-model="inputForm.taxpayerIdentificationNo" placeholder="请填写纳税人识别号" clearable></el-input>
+                <el-input :disabled="method==='view'" v-model="inputForm.taxpayerIdentificationNo" placeholder="请填写纳税人识别号" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col v-if="inputForm.billingType === '1'" :span="12">
@@ -136,7 +137,7 @@
                             :rules="[
                         {required: true, message:'地址不能为空', trigger:'blur'},{required: true, message:'地址不能为空', trigger:'change'}
                ]">
-                <el-input v-model="inputForm.address" placeholder="请填写地址" clearable></el-input>
+                <el-input :disabled="method==='view'" v-model="inputForm.address" placeholder="请填写地址" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col v-if="inputForm.billingType === '1'" :span="12">
@@ -144,7 +145,7 @@
                             :rules="[
                         {required: true, message:'电话不能为空', trigger:'blur'},{required: true, message:'电话不能为空', trigger:'change'}
                ]">
-                <el-input v-model="inputForm.telPhone" placeholder="请填写电话" clearable></el-input>
+                <el-input :disabled="method==='view'" v-model="inputForm.telPhone" placeholder="请填写电话" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col v-if="inputForm.billingType === '1'" :span="12">
@@ -152,7 +153,7 @@
                             :rules="[
                         {required: true, message:'开户银行不能为空', trigger:'blur'},{required: true, message:'开户银行不能为空', trigger:'change'}
                ]">
-                <el-select v-model="inputForm.openBank" @change="changeBank" placeholder="请选择开户银行" clearable style="width: 100%;">
+                <el-select :disabled="method==='view'" v-model="inputForm.openBank" @change="changeBank" placeholder="请选择开户银行" clearable style="width: 100%;">
                   <el-option
                     v-for="item in bankList"
                     :key="item.id"
@@ -176,28 +177,28 @@
               <el-form-item label="纳税人识别号" prop="taxpayerIdentificationNo"
                             :rules="[
                ]">
-                <el-input v-model="inputForm.taxpayerIdentificationNo" placeholder="请填写纳税人识别号" clearable></el-input>
+                <el-input :disabled="method==='view'" v-model="inputForm.taxpayerIdentificationNo" placeholder="请填写纳税人识别号" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col v-if="inputForm.billingType === '1'" :span="12">
               <el-form-item label="地址" prop="address"
                             :rules="[
                ]">
-                <el-input v-model="inputForm.address" placeholder="请填写地址" clearable></el-input>
+                <el-input :disabled="method==='view'" v-model="inputForm.address" placeholder="请填写地址" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col v-if="inputForm.billingType === '1'" :span="12">
               <el-form-item label="电话" prop="telPhone"
                             :rules="[
                ]">
-                <el-input v-model="inputForm.telPhone" placeholder="请填写电话" clearable></el-input>
+                <el-input :disabled="method==='view'" v-model="inputForm.telPhone" placeholder="请填写电话" clearable></el-input>
               </el-form-item>
             </el-col>
             <el-col v-if="inputForm.billingType === '1'" :span="12">
               <el-form-item label="开户银行" prop="openBank"
                             :rules="[
                ]">
-                <el-select v-model="inputForm.openBank" @change="changeBank" placeholder="请选择开户银行" clearable style="width: 100%;">
+                <el-select :disabled="method==='view'" v-model="inputForm.openBank" @change="changeBank" placeholder="请选择开户银行" clearable style="width: 100%;">
                   <el-option
                     v-for="item in bankList"
                     :key="item.id"
@@ -221,7 +222,7 @@
                           :rules="[
                           {required: true, message:'收款类型不能为空', trigger:'blur'}
                  ]">
-              <el-select v-model="inputForm.receivablesType" placeholder="请选择收款类型" clearable style="width: 100%;">
+              <el-select :disabled="method==='view'" v-model="inputForm.receivablesType" placeholder="请选择收款类型" clearable style="width: 100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('invoice_receivables_type')"
                   :key="item.value"
@@ -236,7 +237,7 @@
                           :rules="[
                           {required: true, message:'开票内容不能为空', trigger:'blur'}
                  ]">
-              <el-select v-model="inputForm.billingContent" placeholder="请选择开票内容" clearable style="width: 100%;">
+              <el-select :disabled="method==='view'" v-model="inputForm.billingContent" placeholder="请选择开票内容" clearable style="width: 100%;">
                 <el-option
                   v-for="item in $dictUtils.getDictList('invoice_billing_content')"
                   :key="item.value"
@@ -252,6 +253,7 @@
                           {required: true, message:'发票金额不能为空', trigger:'blur'}
                  ]">
               <el-input-number
+				  :disabled="method==='view'"
                 v-model="inputForm.account"
                 controls-position="right"
                 :controls="false"
@@ -270,7 +272,7 @@
                           :rules="[
                         {required: true, message:'是否多张开票不能为空', trigger:'blur'}
                ]">
-              <el-radio v-model="inputForm.isMultiple" v-for="item in yesNoFlag" :label="item.value" style="margin-right: 20px">
+              <el-radio :disabled="method==='view'" v-model="inputForm.isMultiple" v-for="item in yesNoFlag" :label="item.value" style="margin-right: 20px">
                 {{item.label}}</el-radio>
             </el-form-item>
           </el-col>
@@ -278,7 +280,7 @@
             <el-form-item label="开票内容要求" prop="billingContentTerms"
                           :rules="[
                  ]">
-              <el-input type="textarea" maxlength="500" v-model="inputForm.billingContentTerms" placeholder="开票内容要求" show-word-limit></el-input>
+              <el-input type="textarea" :disabled="method==='view'" maxlength="500" v-model="inputForm.billingContentTerms" placeholder="开票内容要求" show-word-limit></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -338,6 +340,7 @@
                 :value="inputForm.billingPeopleReal"
                 :clearable="true"
                 :accordion="true"
+				:disabled="method==='view'"
                 @getValue="(value) => {inputForm.billingPeopleReal=value}"/>
             </el-form-item>
           </el-col>
@@ -357,6 +360,7 @@
                 :value="inputForm.reconciliationPeople"
                 :clearable="true"
                 :accordion="true"
+				:disabled="method==='view'"
                 @getValue="(value) => {inputForm.reconciliationPeople=value}"/>
             </el-form-item>
           </el-col>
@@ -376,6 +380,7 @@
                 :clearable="true"
                 :accordion="true"
 				size="default"
+				:disabled="method==='view'"
                 @getValue="(value) => {inputForm.reconciliationArea=value}"/>
             </el-form-item>
           </el-col>
@@ -383,7 +388,7 @@
             <el-form-item label="备注" prop="remarks"
                           :rules="[
                  ]">
-              <el-input maxlength="500" type="textarea" placeholder="请填写备注" v-model="inputForm.remarks" show-word-limit></el-input>
+              <el-input maxlength="500" :disabled="method==='view'" type="textarea" placeholder="请填写备注" v-model="inputForm.remarks" show-word-limit></el-input>
             </el-form-item>
           </el-col>
         </el-row>
@@ -528,12 +533,18 @@
 			</el-col>
           </el-row>
         </el-form>
-        <el-divider content-position="left"><i class="el-icon-document"></i>
-          收款明细
-          <el-button style="margin-left: 20px" :disabled="receivablesFlag!==true" type="primary" @click="insertEvent('receivables')" plain>
-            新增
-          </el-button>
-        </el-divider>
+		  <el-divider content-position="left"><i class="el-icon-document"></i>
+			  收款明细
+			  <el-button style="margin-left: 20px" :disabled="receivablesFlag!==true" type="primary" @click="insertEvent('receivables')">
+				  新增
+			  </el-button>
+		  </el-divider>
+<!--        <el-divider content-position="left"><i class="el-icon-document"></i>-->
+<!--          收款明细-->
+<!--          <vxe-button style="margin-left: 20px" :disabled="receivablesFlag!==true" status="primary" @click="insertEvent('receivables')">-->
+<!--            新增-->
+<!--          </vxe-button>-->
+<!--        </el-divider>-->
         <el-form :model="inputForm" ref="inputForm" v-loading="loading" :class="method==='view'?'readonly':''"  :disabled="receivablesFlag!==true"
                  label-width="160px" @submit.native.prevent>
         <el-row  :gutter="15">
@@ -547,6 +558,7 @@
 				  :data="inputForm.financeInvoiceReceivablesDTOList"
 				  style="margin-left: 5em"
 				  highlight-current-row
+				  :key="detailKey2"
 				  :edit-config="{trigger: 'click', mode: 'cell', showStatus: true, autoClear: true}"
 			  >
 				  <vxe-table-column field="remittanceUnit" title="汇款单位" :edit-render="{}">
@@ -666,6 +678,7 @@
         detailFlag: '', // true为修改发票明细
         importVisible: false,
 		  detailKey: '',
+		  detailKey2: '',
         yesNoFlag: [{label: '否', value: '0'}, {label: '是', value: '1'}]
       }
     },
@@ -964,7 +977,10 @@
         }
         if (type === 'receivables') {
           this.$refs.receivablesTable.insert().then((data) => {
+          	console.log('data', data)
             this.inputForm.financeInvoiceReceivablesDTOList.push(data)
+			  console.log('this.inputForm.financeInvoiceReceivablesDTOList', this.inputForm.financeInvoiceReceivablesDTOList)
+			  this.detailKey2  = Math.random()
           })
         }
       },

+ 16 - 6
src/views/cw/workClientInfo/clientUserSelect/UserSelectDialog.vue

@@ -68,12 +68,22 @@
 							v-if="limit <= 1"
 							width="50">
 							<template #default="scope">
-								<el-radio
-										  :label="scope.row.id"
-										  :value="dataListAllSelections[0]&&dataListAllSelections[0].id"
-										  @change.native="getTemplateRow(scope.$index,scope.row)">
-									<span></span>
-								</el-radio>
+								<el-radio-group v-model="dataListAllSelections[0]" @change.native="getTemplateRow(scope.$index, scope.row)">
+									<el-radio :label="scope.row">
+										<template #default="{ label }">
+											<!-- 将label文本设置为空 -->
+											<span></span>
+										</template>
+									</el-radio>
+								</el-radio-group>
+<!--								<el-radio-group :value="dataListAllSelections[0]&&dataListAllSelections[0].id"  @change.native="getTemplateRow(scope.$index, scope.row)">-->
+<!--									<el-radio-->
+<!--										:label="scope.row.id"-->
+<!--										:value="dataListAllSelections[0]&&dataListAllSelections[0].id"-->
+<!--										@change.native="getTemplateRow(scope.$index,scope.row)">-->
+<!--										<span></span>-->
+<!--									</el-radio>-->
+<!--								</el-radio-group>-->
 							</template>
 						</el-table-column>
 						<el-table-column