发票类型调整

src/views/cw/invoice/InvoiceForm.vue

@@ -111,36 +111,35 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row :gutter="15">
-          <el-col v-if="inputForm.billingType === '2'" :span="12">
-            <el-form-item label="姓名" prop="name"
-                          :rules="[
+			<el-col v-if="inputForm.billingType === '2'" :span="12">
+				<el-form-item label="姓名" prop="name"
+							  :rules="[
                           {required: true, message:'姓名不能为空', trigger:'blur'}
                  ]">
-<!--              <SelectUserTree-->
-<!--                ref="companyTree"-->
-<!--                size="default"-->
-<!--                :props="{-->
-<!--                  value: 'id',             // ID字段名-->
-<!--                  label: 'name',         // 显示名称-->
-<!--                  children: 'children'    // 子级字段名-->
-<!--                }"-->
-<!--                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
-<!--                :value="inputForm.name"-->
-<!--                :clearable="true"-->
-<!--                :accordion="true"-->
+					<!--              <SelectUserTree-->
+					<!--                ref="companyTree"-->
+					<!--                size="default"-->
+					<!--                :props="{-->
+					<!--                  value: 'id',             // ID字段名-->
+					<!--                  label: 'name',         // 显示名称-->
+					<!--                  children: 'children'    // 子级字段名-->
+					<!--                }"-->
+					<!--                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+					<!--                :value="inputForm.name"-->
+					<!--                :clearable="true"-->
+					<!--                :accordion="true"-->
 
-<!--                @getValue="(value) => {inputForm.name=value}"/>-->
-				<el-input
-					placeholder="请填写姓名"
-					maxlength="15"
-					v-model="inputForm.name"
-				>
-				</el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="15">
+					<!--                @getValue="(value) => {inputForm.name=value}"/>-->
+					<el-input
+						placeholder="请填写姓名"
+						maxlength="15"
+						v-model="inputForm.name"
+					>
+					</el-input>
+				</el-form-item>
+			</el-col>
           <el-col v-if="inputForm.billingType === '1'" :span="12">
             <el-form-item label="实际开票单位" prop="billingWorkplaceReal"
                           :rules="[
@@ -248,6 +247,13 @@
                 <el-input  v-model="inputForm.telPhone" placeholder="请填写电话" clearable></el-input>
               </el-form-item>
             </el-col>
+			  <el-col v-if="inputForm.billingType === '2'" :span="12">
+				  <el-form-item label="电话" prop="telPhone"
+								:rules="[
+             ]">
+					  <el-input 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="[
@@ -262,6 +268,13 @@
                 </el-select>
               </el-form-item>
             </el-col>
+			  <el-col v-if="inputForm.billingType === '2'" :span="12">
+				  <el-form-item label="开户银行" prop="openBank"
+								:rules="[
+             ]">
+					  <el-input placeholder="请填写开户银行" v-model="inputForm.openBank" clearable></el-input>
+				  </el-form-item>
+			  </el-col>
             <el-col v-if="inputForm.billingType === '1'" :span="12">
               <el-form-item label="银行账号" prop="bankAccount"
                             :rules="[
@@ -269,6 +282,13 @@
                 <el-input :disabled="true" placeholder="请填写银行账号" v-model="inputForm.bankAccount" clearable></el-input>
               </el-form-item>
             </el-col>
+			  <el-col v-if="inputForm.billingType === '2'" :span="12">
+				  <el-form-item label="银行账号" prop="bankAccount"
+								:rules="[
+             ]">
+					  <el-input placeholder="请填写银行账号" v-model="inputForm.bankAccount" clearable></el-input>
+				  </el-form-item>
+			  </el-col>
           </template>
 
           <el-col :span="12">

src/views/cw/invoice/InvoiceFormTask.vue

@@ -115,34 +115,33 @@
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="15">
-        <el-col v-if="inputForm.billingType === '2'" :span="12">
-          <el-form-item label="姓名" prop="name"
-                        :rules="[
+		  <el-col v-if="inputForm.billingType === '2'" :span="12">
+			  <el-form-item label="姓名" prop="name"
+							:rules="[
                         {required: true, message:'姓名不能为空', trigger:'blur'}
                ]">
-<!--            <SelectUserTree-->
-<!--              ref="companyTree"-->
-<!--              :props="{-->
-<!--                value: 'id',             // ID字段名-->
-<!--                label: 'name',         // 显示名称-->
-<!--                children: 'children'    // 子级字段名-->
-<!--              }"-->
-<!--              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
-<!--              :value="inputForm.name"-->
-<!--              :clearable="true"-->
-<!--              :accordion="true"-->
-<!--              @getValue="(value) => {inputForm.name=value}"/>-->
-			  <el-input
-				  placeholder="请填写姓名"
-				  maxlength="15"
-				  v-model="inputForm.name"
-			  >
-			  </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="15">
+				  <!--            <SelectUserTree-->
+				  <!--              ref="companyTree"-->
+				  <!--              :props="{-->
+				  <!--                value: 'id',             // ID字段名-->
+				  <!--                label: 'name',         // 显示名称-->
+				  <!--                children: 'children'    // 子级字段名-->
+				  <!--              }"-->
+				  <!--              :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+				  <!--              :value="inputForm.name"-->
+				  <!--              :clearable="true"-->
+				  <!--              :accordion="true"-->
+				  <!--              @getValue="(value) => {inputForm.name=value}"/>-->
+				  <el-input
+					  placeholder="请填写姓名"
+					  maxlength="15"
+					  v-model="inputForm.name"
+				  >
+				  </el-input>
+			  </el-form-item>
+		  </el-col>
         <el-col v-if="inputForm.billingType === '1'" :span="12">
           <el-form-item label="实际开票单位" prop="billingWorkplaceReal"
                         :rules="[
@@ -259,6 +258,13 @@
               </el-input>
             </el-form-item>
           </el-col>
+			<el-col v-if="inputForm.billingType === '2'" :span="12">
+				<el-form-item label="电话" prop="telPhone"
+							  :rules="[
+             ]">
+					<el-input 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="[
@@ -273,6 +279,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+			<el-col v-if="inputForm.billingType === '2'" :span="12">
+				<el-form-item label="开户银行" prop="openBank"
+							  :rules="[
+             ]">
+					<el-input placeholder="请填写开户银行" v-model="inputForm.openBank" clearable></el-input>
+				</el-form-item>
+			</el-col>
           <el-col v-if="inputForm.billingType === '1'" :span="12">
             <el-form-item label="银行账号" prop="bankAccount"
                           :rules="[
@@ -280,6 +293,13 @@
               <el-input :disabled="true" placeholder="请填写银行账号" v-model="inputForm.bankAccount" clearable></el-input>
             </el-form-item>
           </el-col>
+			<el-col v-if="inputForm.billingType === '2'" :span="12">
+				<el-form-item label="银行账号" prop="bankAccount"
+							  :rules="[
+             ]">
+					<el-input placeholder="请填写银行账号" v-model="inputForm.bankAccount" clearable></el-input>
+				</el-form-item>
+			</el-col>
         </template>
 
         <el-col :span="12">

src/views/cw/invoice/InvoiceList.vue

@@ -10,10 +10,10 @@
       <!-- 搜索框-->
       <el-row :gutter="0">
         <el-form-item prop="no" label="发票申请编号">
-          <el-input v-model="searchForm.no" placeholder="请输入发票申请编号" clearable></el-input>
+          <el-input v-model="searchForm.no" placeholder="请输入发票申请编号" clearable  :style="styles"></el-input>
         </el-form-item>
         <el-form-item prop="number" label="发票号">
-          <el-input v-model="searchForm.number" placeholder="请输入发票号" clearable></el-input>
+          <el-input v-model="searchForm.number" placeholder="请输入发票号" clearable  :style="styles"></el-input>
         </el-form-item>
 <!--        <el-form-item prop="programName" label="项目名称">-->
 <!--          <el-input  v-model="searchForm.programName" placeholder="请输入项目名称" clearable @clear="clearProgram">-->
@@ -81,8 +81,11 @@
             @getValue="(value) => {searchForm.operatorOffice=value}"/>
         </el-form-item>
         <el-form-item v-if="showHideItem" prop="billingWorkplaceReal" label="开票单位">
-          <el-input v-model="searchForm.billingWorkplaceReal" placeholder="请输入开票单位" clearable></el-input>
+          <el-input v-model="searchForm.billingWorkplaceReal" placeholder="请输入开票单位" clearable  :style="styles"></el-input>
         </el-form-item>
+		  <el-form-item v-if="showHideItem" prop="name" label="个人开票姓名">
+			  <el-input v-model="searchForm.name" placeholder="请输入个人开票姓名" clearable  :style="styles"></el-input>
+		  </el-form-item>
         <el-form-item v-if="showHideItem" prop="receivablesStatus" label="是否收款">
           <el-select v-model="searchForm.receivablesStatus" placeholder="请选择是否收款" clearable>
             <el-option
@@ -252,7 +255,7 @@
             </template>
           </vxe-column>
           <vxe-column min-width="150" title="发票号" align="center" field="number"></vxe-column>
-          <vxe-column min-width="150" title="实际开票单位" align="center" field="billingWorkplaceReal"></vxe-column>
+          <vxe-column min-width="150" title="实际开票单位/个人" align="center" field="billingWorkplaceReal"></vxe-column>
           <vxe-column min-width="150" title="经办人" align="center" field="operator"></vxe-column>
           <vxe-column min-width="150" title="经办人部门" align="center" field="operatorOffice"></vxe-column>
           <vxe-column min-width="150" title="开票总金额（元）" align="center" field="account"></vxe-column>
@@ -382,6 +385,9 @@
   export default {
     data () {
       return {
+		  styles:{
+			  width : '200px !important'
+		  },
 	    dialogFormVisible:false,
 		searchVisible: true,
         showHideItem: false,
@@ -405,7 +411,8 @@
 		  label:'',
 		  loginName:this.$store.state.user.name,
 		  reportType:'',
-			status:''
+			status:'',
+			name:''
         },
         dataList: [],
         tablePage: {

src/views/finance/invoice/InvoiceForm.vue

@@ -93,35 +93,34 @@
             </el-form-item>
           </el-col>
         </el-row>
+
         <el-row :gutter="15">
-          <el-col v-if="inputForm.billingType === '2'" :span="12">
-            <el-form-item label="姓名" prop="name"
-                          :rules="[
+			<el-col v-if="inputForm.billingType === '2'" :span="12">
+				<el-form-item label="姓名" prop="name"
+							  :rules="[
                           {required: true, message:'姓名不能为空', trigger:'blur'}
                  ]">
-<!--              <SelectUserTree-->
-<!--                ref="companyTree"-->
-<!--                size="large"-->
-<!--                :props="{-->
-<!--                  value: 'id',             // ID字段名-->
-<!--                  label: 'name',         // 显示名称-->
-<!--                  children: 'children'    // 子级字段名-->
-<!--                }"-->
-<!--                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
-<!--                :value="inputForm.name"-->
-<!--                :clearable="true"-->
-<!--                :accordion="true"-->
-<!--                @getValue="(value) => {inputForm.name=value}"/>-->
-				<el-input
-					placeholder="请填写姓名"
-					maxlength="15"
-					v-model="inputForm.name"
-				>
-				</el-input>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row :gutter="15">
+					<!--              <SelectUserTree-->
+					<!--                ref="companyTree"-->
+					<!--                size="large"-->
+					<!--                :props="{-->
+					<!--                  value: 'id',             // ID字段名-->
+					<!--                  label: 'name',         // 显示名称-->
+					<!--                  children: 'children'    // 子级字段名-->
+					<!--                }"-->
+					<!--                :url="`/system-server/sys/user/treeUserDataAllOffice?type=2`"-->
+					<!--                :value="inputForm.name"-->
+					<!--                :clearable="true"-->
+					<!--                :accordion="true"-->
+					<!--                @getValue="(value) => {inputForm.name=value}"/>-->
+					<el-input
+						placeholder="请填写姓名"
+						maxlength="15"
+						v-model="inputForm.name"
+					>
+					</el-input>
+				</el-form-item>
+			</el-col>
           <el-col v-if="inputForm.billingType === '1'" :span="12">
             <el-form-item label="实际开票单位" prop="billingWorkplaceReal"
                           :rules="[
@@ -222,6 +221,27 @@
                 <el-input v-model="inputForm.telPhone" placeholder="请填写电话" clearable></el-input>
               </el-form-item>
             </el-col>
+			  <el-col v-if="inputForm.billingType === '2'" :span="12">
+				  <el-form-item label="电话" prop="telPhone"
+								:rules="[
+             ]">
+					  <el-input v-model="inputForm.telPhone" placeholder="请填写电话" clearable></el-input>
+				  </el-form-item>
+			  </el-col>
+			  <el-col v-if="inputForm.billingType === '2'" :span="12">
+				  <el-form-item label="开户银行" prop="openBank"
+								:rules="[
+             ]">
+					  <el-input placeholder="请填写开户银行" v-model="inputForm.openBank" clearable></el-input>
+				  </el-form-item>
+			  </el-col>
+			  <el-col v-if="inputForm.billingType === '2'" :span="12">
+				  <el-form-item label="银行账号" prop="bankAccount"
+								:rules="[
+             ]">
+					  <el-input placeholder="请填写银行账号" v-model="inputForm.bankAccount" clearable></el-input>
+				  </el-form-item>
+			  </el-col>
             <el-col v-if="inputForm.billingType === '1'" :span="12">
               <el-form-item label="开户银行" prop="openBank"
                             :rules="[

src/views/finance/invoice/InvoiceFormTask.vue

@@ -85,22 +85,21 @@
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="15">
-        <el-col v-if="inputForm.billingType === '2'" :span="12">
-			<el-form-item label="姓名" prop="name"
-						  :rules="[
+		  <el-col v-if="inputForm.billingType === '2'" :span="12">
+			  <el-form-item label="姓名" prop="name"
+							:rules="[
                         {required: true, message:'姓名不能为空', trigger:'blur'}
                ]">
-				<el-input
-					placeholder="请填写姓名"
-					maxlength="15"
-					v-model="inputForm.name"
-				>
-				</el-input>
-			</el-form-item>
-        </el-col>
-      </el-row>
-      <el-row :gutter="15">
+				  <el-input
+					  placeholder="请填写姓名"
+					  maxlength="15"
+					  v-model="inputForm.name"
+				  >
+				  </el-input>
+			  </el-form-item>
+		  </el-col>
         <el-col v-if="inputForm.billingType === '1'" :span="12">
           <el-form-item label="实际开票单位" prop="billingWorkplaceReal"
                         :rules="[
@@ -209,6 +208,13 @@
               <el-input v-model="inputForm.telPhone" placeholder="请填写电话" clearable></el-input>
             </el-form-item>
           </el-col>
+			<el-col v-if="inputForm.billingType === '2'" :span="12">
+				<el-form-item label="电话" prop="telPhone"
+							  :rules="[
+             ]">
+					<el-input 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="[
@@ -223,6 +229,13 @@
               </el-select>
             </el-form-item>
           </el-col>
+			<el-col v-if="inputForm.billingType === '2'" :span="12">
+				<el-form-item label="开户银行" prop="openBank"
+							  :rules="[
+             ]">
+					<el-input placeholder="请填写开户银行" v-model="inputForm.openBank" clearable></el-input>
+				</el-form-item>
+			</el-col>
           <el-col v-if="inputForm.billingType === '1'" :span="12">
             <el-form-item label="银行账号" prop="bankAccount"
                           :rules="[
@@ -230,6 +243,13 @@
               <el-input :disabled="true" placeholder="请填写银行账号" v-model="inputForm.bankAccount" clearable></el-input>
             </el-form-item>
           </el-col>
+			<el-col v-if="inputForm.billingType === '2'" :span="12">
+				<el-form-item label="银行账号" prop="bankAccount"
+							  :rules="[
+             ]">
+					<el-input placeholder="请填写银行账号" v-model="inputForm.bankAccount" clearable></el-input>
+				</el-form-item>
+			</el-col>
         </template>
 
         <el-col :span="12">