Merge branch 'dev-yjl' into 'shenzhen-dev'

港投项目-发票记录开发/中建四-大屏监控图片修改

See merge request !160

src/assets/js/api/materialManagement.js

@@ -57,6 +57,14 @@ export const editGtMaterialContractArrivalAcceptanceApi = data => post('/xmgl/gt
 export const gettGMaterialContractArrivalAcceptancePageApi = data => get('/xmgl/gt/gtMaterialContractArrivalAcceptance/list', data);
 
 
+//合同管理_基本信息_发票记录
+export const addgtMaterialInvoiceRecordApi = data => post('/xmgl/gtMaterialInvoiceRecord/add', data);
+export const deletgtMaterialInvoiceRecordApi = data => post('/xmgl/gtMaterialInvoiceRecord/delete', data);
+export const editgtMaterialInvoiceRecordApi = data => post('/xmgl/gtMaterialInvoiceRecord/edit', data);
+export const getgtMaterialInvoiceRecordApi = data => get('/xmgl/gtMaterialInvoiceRecord/list', data);
+
+
+
 //合同管理_供应商评价记录
 export const addGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/add', data);
 export const deletGtMaterialSupplierEvaluationRecordApi = data => post('/xmgl/gt/gtMaterialSupplierEvaluationRecord/delete', data);

src/assets/js/http.js

@@ -87,6 +87,7 @@ if (process.env.NODE_ENV == 'development') {
   // axios.defaults.baseURL = 'http://121.196.214.246/api/'//金林湾线上新
   // axios.defaults.baseURL = 'http://42.194.144.62:8088/'//中建四局线上（新）地址
   // axios.defaults.baseURL = 'http://101.43.164.214:12350'//中建五局线上
+  // axios.defaults.baseURL = 'http://182.90.224.147:15551'//港投项目线上
 
 } else if (process.env.NODE_ENV == 'debug') {
   axios.defaults.baseURL = 'https://www.ceshi.com'

src/views/projectAdmin/fourEngin/monitor/index.vue

@@ -4,7 +4,6 @@
     <Card title="总平面图" style="width:390%">
       <div style="width:326px;height:170px;position: absolute;">
         <img style="width:310px;height:170px;margin-top: 20px;" src="~@/assets/images/zjsj/monitor.jpg" alt="">
-
       </div>
     </Card>
   </div>

src/views/projectFront/contractManagement/basicInformation.vue

@@ -451,12 +451,13 @@
           >
         </div>
         <el-tabs
-          style="margin-bottom: 5px; width: 196px"
+          style="margin-bottom: 5px; width: 292px"
           v-model="dialogSteps"
           type="card"
         >
           <el-tab-pane label="付款记录" name="0"></el-tab-pane>
           <el-tab-pane label="到货验收" name="1"></el-tab-pane>
+          <el-tab-pane label="发票记录" name="2"></el-tab-pane>
         </el-tabs>
 
         <div class="importMaterialBox" v-show="dialogSteps == 0">
@@ -724,6 +725,73 @@
             </el-table-column>
           </el-table>
         </div>
+        <div class="importMaterialBox" v-show="dialogSteps == 2">
+          <el-table
+            class="tables"
+            :data="invoiceList"
+            height="360"
+            style="min-height: auto"
+          >
+            <el-table-column
+              label="申请时间"
+              prop="applicationTime"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              label="签约主体"
+              prop="signingParty"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              label="发票类型"
+              prop="invoiceFormat"
+              align="center"
+            ></el-table-column>
+            <el-table-column
+              label="发票介质"
+              prop="invoiceMedium"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              label="开票方式"
+              prop="billingMethod"
+              align="center"
+            >
+            </el-table-column>
+            <el-table-column
+              label="发票金额（￥）"
+              prop="invoiceAmount"
+              align="center"
+            >
+            </el-table-column>
+
+            <el-table-column label="状态" prop="status" align="center">
+            </el-table-column>
+            <el-table-column label="操作" align="center">
+              <template slot-scope="scope">
+                <div class="tableBtns">
+                  <div @click="edit(scope.row, 4)" class="operationText">
+                    <img
+                      src="@/assets/images/icon-edit.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>编辑</span>
+                  </div>
+                  <div @click="deleteDev(scope.row, 4)" class="operationText">
+                    <img
+                      src="@/assets/images/icon-delete.png"
+                      width="15px"
+                      height="15px"
+                    />
+                    <span>删除</span>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
 
         <div class="dialog-footer">
           <el-button
@@ -990,6 +1058,88 @@
         </el-form>
       </div>
     </el-dialog>
+    <!-- 详情-发票记录新增 -->
+    <el-dialog
+      :modal-append-to-body="false"
+      @close="close"
+      :title="invoiceShowtitle"
+      :visible.sync="invoiceShow"
+      width="667px"
+    >
+      <div class="dialog_content">
+        <el-form
+          size="medium"
+          ref="invoiceFrom"
+          :model="invoiceFrom"
+          label-width="120px"
+          class="dialogFormBox"
+        >
+          <el-form-item label="申请时间" prop="applicationTime">
+            <el-date-picker
+              style="width: 320px !important"
+              v-model="invoiceFrom.applicationTime"
+              type="date"
+              placeholder="选择日期"
+              value-format="yyyy-MM-dd"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="签约主体" prop="signingParty">
+            <el-input
+              v-model="invoiceFrom.signingParty"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="发票类型" prop="invoiceFormat">
+            <el-input
+              v-model="invoiceFrom.invoiceFormat"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="发票介质" prop="invoiceMedium">
+            <el-input
+              v-model="invoiceFrom.invoiceMedium"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+
+          <el-form-item label="开票方式" prop="billingMethod">
+            <el-input
+              v-model="invoiceFrom.billingMethod"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="发票金额（￥）" prop="invoiceAmount">
+            <el-input
+            v-model="invoiceFrom.invoiceAmount"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <el-form-item label="状态" prop="status">
+            <el-input
+              v-model="invoiceFrom.status"
+              placeholder="请输入"
+            ></el-input>
+          </el-form-item>
+          <div class="dialog-footer">
+            <el-button
+              class="cancleBtn"
+              @click="invoiceShow = false"
+              icon="el-icon-circle-close"
+              size="medium"
+              >{{ $t('message.deviceManage.cancel') }}
+            </el-button>
+            <el-button
+              type="primary"
+              icon="el-icon-circle-check"
+              @click="submit(4)"
+              size="medium"
+              >{{ $t('message.deviceManage.save') }}
+            </el-button>
+          </div>
+        </el-form>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -1005,7 +1155,11 @@ import {
   addGtMaterialContractArrivalAcceptanceApi,//到货验收
   deletGtMaterialContractArrivalAcceptanceApi,
   editGtMaterialContractArrivalAcceptanceApi,
-  gettGMaterialContractArrivalAcceptancePageApi
+  gettGMaterialContractArrivalAcceptancePageApi,
+  addgtMaterialInvoiceRecordApi,//发票记录
+  deletgtMaterialInvoiceRecordApi,
+  editgtMaterialInvoiceRecordApi,
+  getgtMaterialInvoiceRecordApi
 } from '@/assets/js/api/materialManagement.js'
 export default {
   mounted() {
@@ -1091,7 +1245,21 @@ export default {
       addOrEditDialog: false,
       surveySchemeList: [],
       dialogShow: false,
+      //发票记录
+      invoiceShowtitle: '',
+      invoiceShow: false,
+      invoiceFrom: {
+        applicationTime: '',
+        signingParty: '',
+        signingParty: '',
+        invoiceFormat: '',
+        invoiceMedium: '',
+        billingMethod: '',
+        invoiceAmount: '',
+        status: '',
 
+      },
+      invoiceList:[],
     }
   },
   methods: {
@@ -1201,6 +1369,17 @@ export default {
         }
       })
     },
+    //查询发票记录
+    getInvoiceList(){
+      getgtMaterialInvoiceRecordApi({
+        projectSn: this.$store.state.projectSn,
+        gtMaterialContractId: this.gtMaterialContractId
+      }).then((result) => {
+        if (result.success) {
+          this.invoiceList = result.result
+        }
+      })
+    },
     add(type) {
       if (type == 1) {
         this.basicForTitle = '新增信息'
@@ -1211,13 +1390,21 @@ export default {
         this.tenderRecordsShow = true
         this.tenderRecordsForm = {}
         this.close()
-      } else if (type == 2 && this.dialogSteps == 1) {
+      }
+      else if (type == 2 && this.dialogSteps == 1) {
         this.tenderListShow = true
         this.tenderListShowtitle = '新增验收'
         this.ArrivalFrom = {}
         this.close()
 
       }
+      else if (type == 2 && this.dialogSteps == 2) {
+        this.invoiceShow = true
+        this.invoiceShowtitle = '新增发票'
+        this.invoiceFrom = {}
+        this.close()
+
+      }
     },
     edit(obj, type) {
       if (type == 1) {
@@ -1230,12 +1417,17 @@ export default {
         this.tenderRecordsForm = JSON.parse(JSON.stringify(obj))
         this.fileList1 = obj.invoiceVoucher
         this.fileList2 = obj.paymentProof
-      } else {
+      }
+      else if (type == 3) {
         this.tenderListShow = true
         this.tenderListShowtitle = '编辑验收'
         this.ArrivalFrom = JSON.parse(JSON.stringify(obj))
         this.fileList3 = obj.arrivalPicture
         this.fileList4 = obj.acceptancePhoto
+      } else {
+        this.invoiceShow = true
+        this.invoiceShowtitle = '编辑发票'
+        this.invoiceFrom = JSON.parse(JSON.stringify(obj))
       }
 
     },
@@ -1294,7 +1486,8 @@ export default {
             return false
           }
         })
-      } else {
+      }
+      else if (type == 3) {
         let params = JSON.parse(JSON.stringify(this.ArrivalFrom))
         params.projectSn = this.$store.state.projectSn
         params.arrivalPicture = JSON.stringify(this.fileList3)
@@ -1323,6 +1516,32 @@ export default {
           }
         })
       }
+      else {
+        let params = JSON.parse(JSON.stringify(this.invoiceFrom))
+        params.projectSn = this.$store.state.projectSn       
+        params.gtMaterialContractId = this.gtMaterialContractId
+        this.$refs.invoiceFrom.validate((valid) => {
+          if (valid) {
+            if (this.invoiceShowtitle == '新增发票') {
+              addgtMaterialInvoiceRecordApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getInvoiceList()                }
+              })
+            } else if (this.invoiceShowtitle == '编辑发票') {
+              editgtMaterialInvoiceRecordApi(params).then((result) => {
+                if (result.success) {
+                  this.$message.success(result.message)
+                  this.getInvoiceList()                }
+              })
+            }
+            this.invoiceShow = false
+          } else {
+            return false
+          }
+        })
+      }
+
 
     },
     //删除
@@ -1383,7 +1602,7 @@ export default {
               message: "已取消删除",
             });
           });
-      } else {
+      } else if(type == 3) {
         this.$confirm("此操作将永久删除, 是否继续?", "提示", {
           confirmButtonText: "确定",
           cancelButtonText: "取消",
@@ -1411,6 +1630,34 @@ export default {
               message: "已取消删除",
             });
           });
+      }else{
+        this.$confirm("此操作将永久删除, 是否继续?", "提示", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning",
+        })
+          .then(() => {
+            deletgtMaterialInvoiceRecordApi({ id: obj.id }).then((res) => {
+              if (res.success) {
+                this.getInvoiceList()
+                this.$message({
+                  type: "success",
+                  message: "删除成功!",
+                });
+              } else {
+                this.$message({
+                  type: "error",
+                  message: res.message,
+                });
+              }
+            });
+          })
+          .catch(() => {
+            this.$message({
+              type: "info",
+              message: "已取消删除",
+            });
+          });
       }
     },
     //显示检查详细弹框
@@ -1420,6 +1667,7 @@ export default {
       this.gtMaterialContractId = this.detailData.id
       this.getPaymentList()
       this.getArrivalList()
+      this.getInvoiceList()
     },
     // 删除文件
     handleRemove(file, fileList, type) {