wangzhuo 1 gadu atpakaļ
vecāks
revīzija
87407abeba

+ 82 - 0
src/views/finance/invoiceAccess/detailsPage.vue

@@ -136,6 +136,7 @@
         <!--              <el-button icon="el-icon-search" size="mini" type="cyan" @click="handleQuery">搜索</el-button>-->
         <el-button :disabled="queryParams.kpType == 2" size="mini" icon="el-icon-edit" type="success" @click="amend">修改</el-button>
         <el-button :disabled="dataDisabled" size="mini" icon="el-icon-plus" type="primary" @click="handleQuery(1)">筛选</el-button>
+        <el-button :disabled="dataDisabled" size="mini" icon="el-icon-plus" type="primary" @click="addXsckXzDialog = true">添加开票</el-button>
         <el-button :disabled="dataDisabled" size="mini" icon="el-icon-check" type="primary" plain @click="submit">保存</el-button>
         <el-button v-if="queryParams.kpType == 1 || !queryParams.kpType" size="mini" icon="el-icon-lollipop" type="primary" @click="billings(1)">开票
         </el-button>
@@ -211,6 +212,60 @@
       </span>
     </el-dialog>
 
+    <el-dialog
+      title="提示"
+      :visible.sync="addXsckXzDialog"
+      width="50%">
+      <el-form ref="form" :model="form" :rules="xsckXzRules" label-width="80px">
+        <el-form-item label="入库单号">
+          <el-input v-model="form.fBillno"></el-input>
+        </el-form-item>
+        <el-form-item label="入库日期">
+          <el-date-picker
+            v-model="form.fBsdate"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+            style="width: 100%;">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="项目名称" prop="projectName">
+          <el-select v-model="form.projectName" filterable clearable placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in fGoodsList"
+              :key="item.fId"
+              :label="item.projectName"
+              :value="item.projectName">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开票公司" prop="fsbuName">
+          <el-select v-model="form.fsbuName" filterable clearable placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in fSbuList"
+              :key="item.fId"
+              :label="item.fName"
+              :value="item.fName">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="金额">
+          <el-input-number v-model="form.fMoney" controls-position="right" @change="handleChange" :min="0" :precision="2" :step="1"></el-input-number>
+        </el-form-item>
+        <el-form-item label="开票金额" prop="kpMoney">
+          <el-input-number v-model="form.kpMoney" controls-position="right" @change="handleChange" :min="0" :precision="2" :step="1"></el-input-number>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addXsckXzDialog = false">取 消</el-button>
+        <el-button type="primary" @click="addXsckXzClick">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -234,6 +289,10 @@ export default {
         kpTime: new Date(),
         type: 2
       },
+
+      addXsckXzDialog: false,
+      form: {},
+
       pageSize: 10,
       pageNum: 1,
       total: 0,
@@ -262,6 +321,17 @@ export default {
         timeIntervalTerminate: [
           { required: true, message: ' ', trigger: 'change' }
         ]
+      },
+      xsckXzRules: {
+        projectName: [
+          { required: true, message: ' ', trigger: 'change' }
+        ],
+        fsbuName: [
+          { required: true, message: ' ', trigger: 'change' }
+        ],
+        kpMoney: [
+          { required: true, message: ' ', trigger: 'change' }
+        ],
       }
     }
   },
@@ -296,6 +366,18 @@ export default {
     })
   },
   methods: {
+    addXsckXzClick() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.xsckXzDataList.push(this.form)
+          this.addXsckXzDialog = false
+          this.form = {}
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];

+ 81 - 0
src/views/finance/invoiceDestroy/detailsPage.vue

@@ -133,6 +133,7 @@
       <el-form-item>
         <el-button :disabled="queryParams.kpType == 2" size="mini" icon="el-icon-edit" type="success" @click="amend">修改</el-button>
         <el-button :disabled="dataDisabled" size="mini" icon="el-icon-plus" type="primary" @click="handleQuery(1)">筛选</el-button>
+        <el-button :disabled="dataDisabled" size="mini" icon="el-icon-plus" type="primary" @click="addXsckXzDialog = true">添加开票</el-button>
         <el-button :disabled="dataDisabled" size="mini" icon="el-icon-check" type="primary" plain @click="submit">保存</el-button>
         <el-button v-if="queryParams.kpType == 1 || !queryParams.kpType" size="mini" icon="el-icon-lollipop" type="primary" @click="billings(1)">开票
         </el-button>
@@ -213,6 +214,60 @@
       </span>
     </el-dialog>
 
+    <el-dialog
+      title="提示"
+      :visible.sync="addXsckXzDialog"
+      width="50%">
+      <el-form ref="form" :model="form" :rules="xsckXzRules" label-width="80px">
+        <el-form-item label="销售单号">
+          <el-input v-model="form.fBillno"></el-input>
+        </el-form-item>
+        <el-form-item label="销售日期">
+          <el-date-picker
+            v-model="form.fBsdate"
+            type="date"
+            format="yyyy-MM-dd"
+            value-format="yyyy-MM-dd"
+            placeholder="选择日期"
+            style="width: 100%;">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="项目名称" prop="projectName">
+          <el-select v-model="form.projectName" filterable clearable placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in fGoodsList"
+              :key="item.fId"
+              :label="item.projectName"
+              :value="item.projectName">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="开票公司" prop="fsbuName">
+          <el-select v-model="form.fsbuName" filterable clearable placeholder="请选择" style="width: 100%;">
+            <el-option
+              v-for="item in fSbuList"
+              :key="item.fId"
+              :label="item.fName"
+              :value="item.fName">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="金额">
+          <el-input-number v-model="form.fMoney" controls-position="right" @change="handleChange" :min="0" :precision="2" :step="1"></el-input-number>
+        </el-form-item>
+        <el-form-item label="开票金额" prop="kpMoney">
+          <el-input-number v-model="form.kpMoney" controls-position="right" @change="handleChange" :min="0" :precision="2" :step="1"></el-input-number>
+        </el-form-item>
+        <el-form-item label="备注">
+          <el-input v-model="form.remark"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="addXsckXzDialog = false">取 消</el-button>
+        <el-button type="primary" @click="addXsckXzClick">确 定</el-button>
+      </span>
+    </el-dialog>
+
   </div>
 </template>
 
@@ -237,6 +292,9 @@ export default {
         type: 1
       },
 
+      addXsckXzDialog: false,
+      form: {},
+
       pageSize: 10,
       pageNum: 1,
       total: 0,
@@ -266,6 +324,17 @@ export default {
         timeIntervalTerminate: [
           { required: true, message: ' ', trigger: 'change' }
         ]
+      },
+      xsckXzRules: {
+        projectName: [
+          { required: true, message: ' ', trigger: 'change' }
+        ],
+        fsbuName: [
+          { required: true, message: ' ', trigger: 'change' }
+        ],
+        kpMoney: [
+          { required: true, message: ' ', trigger: 'change' }
+        ],
       }
     }
   },
@@ -300,6 +369,18 @@ export default {
     })
   },
   methods: {
+    addXsckXzClick() {
+      this.$refs['form'].validate((valid) => {
+        if (valid) {
+          this.xsckXzDataList.push(this.form)
+          this.addXsckXzDialog = false
+          this.form = {}
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
     getSummaries(param) {
       const { columns, data } = param;
       const sums = [];

+ 1 - 0
src/views/finance/invoicePayment/detailsPage.vue

@@ -301,6 +301,7 @@ export default {
     })
     if (this.detailData.id != null) {
       getPayment(this.detailData.id).then(res => {
+        res.data.kpCoId = Number(res.data.kpCoId);
         this.queryParams = res.data
         this.xsckXzDataList = res.data.invoicePaymentDetailList
 

+ 15 - 15
src/views/finance/invoicePaymentAccess/detailsPage.vue

@@ -11,6 +11,21 @@
     <el-form ref="queryForm" :inline="true" :model="queryParams" :rules="rules" label-width="68px">
       <el-row :gutter="15">
         <el-col :span="6">
+          <el-form-item label="供应商" label-width="120px" prop="fCorpid">
+            <el-select v-model="queryParams.fCorpid" :disabled="searchCriteriaDisabled" clearable filterable
+                       placeholder="请选择供应商" @change="fCorpidChange(queryParams.fCorpid)"
+            >
+              <el-option
+                v-for="item in vendorList"
+                :key="item.fId"
+                :label="item.fName"
+                :value="item.fId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
           <el-form-item label="开票日期起" label-width="120px" prop="kpTimeStart">
             <el-date-picker
               v-model="queryParams.kpTimeStart"
@@ -36,21 +51,6 @@
             </el-date-picker>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item label="供应商" label-width="120px" prop="fCorpid">
-            <el-select v-model="queryParams.fCorpid" :disabled="searchCriteriaDisabled" clearable filterable
-                       placeholder="请选择供应商" @change="fCorpidChange(queryParams.fCorpid)"
-            >
-              <el-option
-                v-for="item in vendorList"
-                :key="item.fId"
-                :label="item.fName"
-                :value="item.fId"
-              >
-              </el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
       </el-row>
 
       <el-row :gutter="15">