Merge branch 'master' of http://123.56.95.229:10010/r/高精

src/api/WorkshopProcurement/InvoiceSettlementApplication1.js

@@ -66,7 +66,7 @@ export function submitDelete(...group) {
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '1',
+      type: '2',
       name: '车间采购管理_发票结算申请单_删除数据',
       param: `发票结算申请单流水号=${group[0]}`
     }

src/api/WorkshopProcurement/InvoiceSettlementApprove1.js

@@ -12,7 +12,7 @@ export function searchTable1(...group) {
       ModularID: router.currentRoute.path,
       type: '1',
       name: '车间采购管理_发票结算申请单_查询数据',
-      param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1`,
+      param: `时间段_check=${group[0]}&开始日期=${group[1]}&结束日期=${group[2]}&是否提交=1&角色编号=${group[5]}&供应商_check=${group[6]}&供应商流水号=${group[7]}`,
       Pagination: group[3] + '&' + group[4]
     }
   })
@@ -39,9 +39,23 @@ export function excuteApprove(...data) {
     data: {
       UserID: state.state.user.id,
       ModularID: router.currentRoute.path,
-      type: '1',
+      type: '2',
       name: '车间采购管理_发票结算申请单_执行审批',
-      param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}`
+      param: `发票结算申请单流水号=${data[0]}&人员编号=${data[1]}&审批代号=${data[2]}&审批流水号=${data[3]}&未通过原因=${data[4]}`
+    }
+  })
+}
+// 查询供应商
+export function searchSupplier(check1, value1, check2, value2, check3, value3, check4, value4, check5, value5, check6, value6, check7, value7, check8, value8, check9, value9, check10, value10, check11, value11, check12, value12) {
+  return request({
+    url: '',
+    method: 'post',
+    data: {
+      UserID: state.state.user.id,
+      ModularID: router.currentRoute.path,
+      type: '1',
+      name: '采购管理_供应商_查询数据_根据条件',
+      param: '供应商名称_check=' + check1 + '&供应商名称=' + value1 + '&企业性质_check=' + check2 + '&企业性质=' + value2 + '&创立日期_check=' + check3 + '&创立日期=' + value3 + '&注册资本_check=' + check4 + '&注册资本=' + value4 + '&税号_check=' + check5 + '&税号=' + value5 + '&电子信箱_check=' + check6 + '&电子信箱=' + value6 + '&地址_check=' + check7 + '&地址=' + value7 + '&帐号_check=' + check8 + '&帐号=' + value8 + '&开户行_check=' + check9 + '&开户行=' + value9 + '&电话号码_check=' + check10 + '&电话号码=' + value10 + '&传真_check=' + check11 + '&传真=' + value11 + '&货期_check=' + check12 + '&货期=' + value12
     }
   })
 }

src/views/Assembly/AssemblyExecution/index.vue

@@ -59,7 +59,7 @@
                 placeholder="选择日期时间"/>
             </template>
             <template v-else >
-              {{ scope.row.机床装配开始时间 }}
+              {{ scope.row.机床装配开始时间 ? scope.row.机床装配开始时间.split(' ')[0] : '' }}
             </template>
           </template>
         </el-table-column>
@@ -75,7 +75,7 @@
                 placeholder="选择日期时间"/>
             </template>
             <template v-else >
-              {{ scope.row.机床装配实际完成时间 }}
+              {{ scope.row.机床装配实际完成时间 ? scope.row.机床装配实际完成时间.split(' ')[0] : '' }}
             </template>
           </template>
         </el-table-column>
@@ -91,7 +91,7 @@
                 placeholder="选择日期时间"/>
             </template>
             <template v-else >
-              {{ scope.row.调试开始时间 }}
+              {{ scope.row.调试开始时间 ? scope.row.调试开始时间.split(' ')[0] : '' }}
             </template>
           </template>
         </el-table-column>
@@ -107,7 +107,7 @@
                 placeholder="选择日期时间"/>
             </template>
             <template v-else >
-              {{ scope.row.调试结束时间 }}
+              {{ scope.row.调试结束时间 ? scope.row.调试结束时间.split(' ')[0] : '' }}
             </template>
           </template>
         </el-table-column>
@@ -166,12 +166,12 @@
         </el-table-column>
         <el-table-column label="开始时间" align="center" width="160px">
           <template slot-scope="scope">
-            {{ scope.row.开始时间 }}
+            {{ scope.row.开始时间 ? scope.row.开始时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="结束时间" align="center" width="160px">
           <template slot-scope="scope">
-            {{ scope.row.结束时间 }}
+            {{ scope.row.结束时间 ? scope.row.结束时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center" width="200px">

src/views/Assembly/ColdWorkPlanExecution/index.vue

@@ -69,12 +69,12 @@
         </el-table-column>
         <el-table-column label="开始时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.开始时间 }}
+            {{ scope.row.开始时间 ? scope.row.开始时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="结束时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.结束时间 }}
+            {{ scope.row.结束时间 ? scope.row.结束时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">

src/views/Assembly/ElectricalAssembly/index.vue

@@ -49,22 +49,22 @@
         </el-table-column>
         <el-table-column label="装配开始时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.电气开始装配时间 }}
+            {{ scope.row.电气开始装配时间 ? scope.row.电气开始装配时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="装配结束时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.电气结束装配时间 }}
+            {{ scope.row.电气结束装配时间 ? scope.row.电气结束装配时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="调试开始时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.电气开始调试时间 }}
+            {{ scope.row.电气开始调试时间 ? scope.row.电气开始调试时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="调试结束时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.电气结束调试时间 }}
+            {{ scope.row.电气结束调试时间 ? scope.row.电气结束调试时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="操作" align="center" width="460px" fixed="right">
@@ -115,12 +115,12 @@
         </el-table-column>
         <el-table-column label="开始时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.开始时间 }}
+            {{ scope.row.开始时间 ? scope.row.开始时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="结束时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.结束时间 }}
+            {{ scope.row.结束时间 ? scope.row.结束时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">

src/views/Assembly/PaintPlanExecution/index.vue

@@ -69,12 +69,12 @@
         </el-table-column>
         <el-table-column label="开始时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.开始时间 }}
+            {{ scope.row.开始时间 ? scope.row.开始时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="结束时间" align="center">
           <template slot-scope="scope">
-            {{ scope.row.结束时间 }}
+            {{ scope.row.结束时间 ? scope.row.结束时间.split(' ')[0] : '' }}
           </template>
         </el-table-column>
         <el-table-column label="备注" align="center">

src/views/PurchasingCenter/InvoiceSettlementApplication/index.vue

@@ -136,7 +136,7 @@
           <template slot-scope="scope">
             <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
             <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-edit" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)"/>
-            <el-button :disabled="!(Number(scope.row.审批1流水号)!==1 || Number(scope.row.审批3流水号)===2 || Number(scope.row.审批4流水号)===2)" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)"/>
+            <el-button :disabled="Number(scope.row.是否提交申请)===1 && !(Number(scope.row.审批1流水号)===2 || Number(scope.row.审批3流水号)===2 || Number(scope.row.审批4流水号)===2)" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)"/>
           </template>
         </el-table-column>
       </el-table>
@@ -597,11 +597,9 @@ export default {
         type: 'warning'
       }).then(() => {
         submitDelete(row.发票结算申请单流水号).then(response => {
-          if (response.data[0].result === '删除成功') {
+          if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.searchTable1()
-          } else if (response.data[0].result === '删除失败') {
-            this.$message.error('已提交申请，删除失败')
           } else { this.$message.error('删除失败') }
         })
       }).catch(() => {

src/views/WorkshopProcurement/InvoiceSettlementApplication1/index.vue

@@ -72,38 +72,39 @@
             {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="采购审批" prop="审批人1姓名" align="center" width="100">
+        <el-table-column label="审批结果" align="center" min-width="60">
           <template slot-scope="scope">
-            {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
+            {{ scope.row.审批4结果 }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="110">
+        <el-table-column label="审批未过原因" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
+            {{ scope.row.审批4未过原因 ? scope.row.审批4未过原因 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="财务审批" prop="审批人2姓名" align="center" width="100">
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
+            {{ scope.row.审批4时间 ? scope.row.审批4时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="110">
+        <el-table-column label="财务" align="center" min-width="60">
           <template slot-scope="scope">
-            {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
+            {{ scope.row.审批3结果 }}
           </template>
         </el-table-column>
-        <el-table-column label="总经理审批" prop="审批人3姓名" align="center" width="120">
+        <el-table-column label="财务未过原因" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
+            {{ scope.row.审批3未过原因 ? scope.row.审批3未过原因 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="110">
+        <el-table-column label="审批时间" align="center" min-width="90" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
+            {{ scope.row.审批3时间 ? scope.row.审批3时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="300" fixed="right">
+        <el-table-column label="操作" align="center" width="200" fixed="right">
           <template slot-scope="scope">
+            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-circle-check" size="mini" @click="submitApply(scope.row)">提交申请</el-button>
             <el-tooltip :open-delay="1000" effect="dark" content="编辑" placement="top">
               <div style="display: inline-block">
                 <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-edit-outline" size="mini" style="margin-left:10px" @click="handleEdit(scope.row)"/>
@@ -111,10 +112,9 @@
             </el-tooltip>
             <el-tooltip :open-delay="1000" effect="dark" content="删除" placement="top">
               <div style="display: inline-block">
-                <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)"/>
+                <el-button :disabled="Number(scope.row.是否提交申请)===1 && !(Number(scope.row.审批3流水号)===2 || Number(scope.row.审批4流水号)===2)" type="text" icon="el-icon-delete" size="mini" style="margin-left:10px" @click="handleDelete(scope.row)"/>
               </div>
             </el-tooltip>
-            <el-button :disabled="Number(scope.row.是否提交申请)===1" type="text" icon="el-icon-circle-check" size="mini" style="margin-left:10px" @click="submitApply(scope.row)">提交申请</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -546,11 +546,9 @@ export default {
         type: 'warning'
       }).then(() => {
         submitDelete(row.发票结算申请单流水号).then(response => {
-          if (response.data[0].result === '删除成功') {
+          if (response.data[0].result === '1') {
             this.$message.success('删除成功')
             this.searchTable1()
-          } else if (response.data[0].result === '删除失败') {
-            this.$message.error('已提交申请，删除失败')
           } else { this.$message.error('删除失败') }
         })
       }).catch(() => {

src/views/WorkshopProcurement/InvoiceSettlementApprove1/index.vue

@@ -66,27 +66,7 @@
             {{ scope.row.申请时间 ? scope.row.申请时间.split(' ')[0] : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="采购审批" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.审批人1姓名 ? scope.row.审批人1姓名 : '未审批' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="110">
-          <template slot-scope="scope">
-            {{ scope.row.审批1时间 ? scope.row.审批1时间 : '—' }}
-          </template>
-        </el-table-column>
         <el-table-column label="财务审批" align="center" min-width="80">
-          <template slot-scope="scope">
-            {{ scope.row.审批人2姓名 ? scope.row.审批人2姓名 : '未审批' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="审批时间" align="center" min-width="110">
-          <template slot-scope="scope">
-            {{ scope.row.审批2时间 ? scope.row.审批2时间 : '—' }}
-          </template>
-        </el-table-column>
-        <el-table-column label="总经理审批" align="center" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.审批人3姓名 ? scope.row.审批人3姓名 : '未审批' }}
           </template>
@@ -96,9 +76,20 @@
             {{ scope.row.审批3时间 ? scope.row.审批3时间 : '—' }}
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="100" fixed="right">
+        <el-table-column label="总经理审批" align="center" min-width="100">
           <template slot-scope="scope">
-            <el-button :disabled="false" type="primary" size="mini" plain @click="excuteApprove(scope.row)">审批</el-button>
+            {{ scope.row.审批人4姓名 ? scope.row.审批人4姓名 : '未审批' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="审批时间" align="center" min-width="110">
+          <template slot-scope="scope">
+            {{ scope.row.审批4时间 ? scope.row.审批4时间 : '—' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="160" fixed="right">
+          <template slot-scope="scope">
+            <el-button type="text" size="mini" icon="el-icon-check" @click="yesApproval(scope.row)">通过</el-button>
+            <el-button type="text" size="mini" icon="el-icon-close" @click="noApproval(scope.row)">不通过</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -161,7 +152,7 @@
 </template>
 
 <script>
-import { searchTable1, searchTable2, excuteApprove } from '@/api/WorkshopProcurement/InvoiceSettlementApprove1'
+import { searchTable1, searchTable2, excuteApprove, searchSupplier } from '@/api/WorkshopProcurement/InvoiceSettlementApprove1'
 import { mapGetters } from 'vuex'
 import { readFile } from '@/utils/request'
 import request from '@/utils/request'
@@ -177,7 +168,9 @@ export default {
       pageSize1: 10,
       invoiceNumber: '',
       tableData2: [],
-      tableData3: []
+      tableData3: [],
+      supplierValues: [],
+      supplierValue: ''
     }
   },
   computed: {
@@ -191,14 +184,44 @@ export default {
   created() {
     this.fetchData()
     this.searchTable1()
+    this.searchSupplier()
   },
   methods: {
     fetchData() {
       console.log(this.token)
     },
+    searchSupplier() { // 查询创立日期和注册资本大于符合条件的数据
+      this.supplierName ? this.supplierCheck1 = 1 : (this.supplierCheck1 = 0, this.supplierName = '')
+      this.enterpriseNature ? this.supplierCheck2 = 1 : (this.supplierCheck2 = 0, this.enterpriseNature = '')
+      this.createDate ? this.supplierCheck3 = 1 : (this.supplierCheck3 = 0, this.createDate = '')
+      this.registeredCapital ? this.supplierCheck4 = 1 : (this.supplierCheck4 = 0, this.registeredCapital = '')
+      this.taxNum ? this.supplierCheck5 = 1 : (this.supplierCheck5 = 0, this.taxNum = '')
+      this.EMail ? this.supplierCheck6 = 1 : (this.supplierCheck6 = 0, this.EMail = '')
+      this.address ? this.supplierCheck7 = 1 : (this.supplierCheck7 = 0, this.address = '')
+      this.account ? this.supplierCheck8 = 1 : (this.supplierCheck8 = 0, this.account = '')
+      this.openingBank ? this.supplierCheck9 = 1 : (this.supplierCheck9 = 0, this.openingBank = '')
+      this.phone ? this.supplierCheck10 = 1 : (this.supplierCheck10 = 0, this.phone = '')
+      this.fax ? this.supplierCheck11 = 1 : (this.supplierCheck11 = 0, this.fax = '')
+      this.goodTime ? this.supplierCheck12 = 1 : (this.supplierCheck12 = 0, this.goodTime = '')
+      searchSupplier(this.supplierCheck1, this.supplierName, this.supplierCheck2, this.enterpriseNature, this.supplierCheck3, this.createDate, this.supplierCheck4, this.registeredCapital, this.supplierCheck5, this.taxNum, this.supplierCheck6, this.EMail, this.supplierCheck7, this.address, this.supplierCheck8, this.account, this.supplierCheck9, this.openingBank, this.supplierCheck10, this.phone, this.supplierCheck11, this.fax, this.supplierCheck12, this.goodTime).then(response => {
+        for (let i = 0; i < response.data.length; i++) {
+          if (response.data[i].创立日期 !== '' && response.data[i].创立日期 !== null) {
+            response.data[i].创立日期 = response.data[i].创立日期.split(' ')[0]
+          }
+        }
+        for (let i = 0; i < response.data.length; i++) {
+          this.supplierValues.push({
+            label: response.data[i].供应商名称,
+            value: response.data[i].供应商流水号
+          })
+        }
+      })
+    },
     searchTable1() {
+      let check
       this.date1 && this.date2 ? this.check1 = 1 : (this.check1 = 0, this.date1 = '', this.date2 = '')
-      searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1).then(response => {
+      this.supplierValue ? check = 1 : check = 0
+      searchTable1(this.check1, this.date1, this.date2, this.pageCurrent1, this.pageSize1, this.token, check, this.supplierValue).then(response => {
         this.tableData1 = response.data.rows
         this.tableData1.map(v => {
           this.$set(v, 'scanSrc', '')
@@ -230,6 +253,45 @@ export default {
       this.pageCurrent1 = val
       this.searchTable1()
     },
+    yesApproval(row) { // 通过审核
+      this.$confirm('确定审核通过?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        excuteApprove(row.发票结算申请单流水号, this.id, this.token, 1, '').then(response => {
+          console.log(response, 11)
+          if (response.data[0].result === '1') {
+            this.$message.success('执行成功')
+            this.searchTable1()
+          } else { this.$message.error('执行失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消操作'
+        })
+      })
+    },
+    noApproval(row) { // 不通过审核
+      this.$prompt('请输入不通过原因', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消'
+      }).then(({ value }) => {
+        excuteApprove(row.发票结算申请单流水号, this.id, this.token, 2, value).then(response => {
+          if (response.data[0].result === '1') {
+            this.$message.success('执行成功')
+            this.tableData2 = []
+            this.searchTable1()
+          } else { this.$message.error('执行失败') }
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '取消操作'
+        })
+      })
+    },
     excuteApprove(row) {
       this.$confirm('确认审批签字?', '提示', {
         confirmButtonText: '确定',