Compare commits

..

No commits in common. "9ecd74a82db35cce9d6b544d08b3d9e9da88e115" and "b11fcdb236cdbaa2a555b3c8cde51eb4b66c66d0" have entirely different histories.

3 changed files with 7 additions and 19 deletions

4
.env
View file

@ -1,5 +1,5 @@
VITE_BACKEND=http://localhost:4320/api/ # VITE_BACKEND=http://localhost:4320/api/
# VITE_BACKEND=http://192.168.7.160:8080/esign-server/api/ VITE_BACKEND=http://192.168.7.160:8080/esign-server/api/
VITE_HEAD=ARCH. KHASHAYAR L. TOGHYANI VITE_HEAD=ARCH. KHASHAYAR L. TOGHYANI
VITE_PESO= VITE_PESO=
VITE_HEADID=276 VITE_HEADID=276

View file

@ -736,16 +736,6 @@ func connect() {
"result": result, "result": result,
}) })
case "get-signeddateassessed-electrical":
err := db.QueryRow(`SELECT IFNULL(txndate, '') AS result FROM electricaldocflowtxn WHERE electricalid = ? AND remarks = "FOR ELECTRICAL ORDER OF PAYMENT APPROVAL"`, data).Scan(&result)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
c.String(http.StatusBadRequest, err.Error())
return
}
c.JSON(http.StatusOK, gin.H{
"result": result,
})
} }
}) })
@ -784,7 +774,6 @@ func connect() {
c.JSON(http.StatusOK, gin.H{ c.JSON(http.StatusOK, gin.H{
"result": result, "result": result,
}) })
} }
}) })

View file

@ -153,9 +153,6 @@ export default () => {
getPrintDetails(op.result11[0]) getPrintDetails(op.result11[0])
getPrintDetailsFees(op.result11[0]) getPrintDetailsFees(op.result11[0])
getSignatureImage(employeeId()) getSignatureImage(employeeId())
const approversignId = await geteSignId(276)
getApprovedDate(approversignId, applicationNo)
} }
const calculateTotal = (list: number[]) => { const calculateTotal = (list: number[]) => {
@ -263,9 +260,9 @@ export default () => {
} }
} }
const geteSignId = async (id: number) => { const geteSignId = async () => {
try { try {
const response = await ofetch(API + 'get-esignid/' + id, { parseResponse: JSON.parse }) const response = await ofetch(API + 'get-esignid/' + employeeId(), { parseResponse: JSON.parse })
const result = response.result const result = response.result
return result return result
} catch { } catch {
@ -274,7 +271,7 @@ export default () => {
} }
const postTransaction = async (application: string) => { const postTransaction = async (application: string) => {
const id = await geteSignId(employeeId()) const id = await geteSignId()
const today = new Date() const today = new Date()
const formatedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss') const formatedDate = dayjs(today).format('YYYY-MM-DD HH:mm:ss')
@ -282,6 +279,8 @@ export default () => {
method: 'POST', method: 'POST',
body: { data: parseInt(id), data2: application, data3: formatedDate }, body: { data: parseInt(id), data2: application, data3: formatedDate },
}) })
getApprovedDate(id, application)
} }
const getApprovedDate = async (id: number, application: string) => { const getApprovedDate = async (id: number, application: string) => {