20221117

finance @ 6e137f66

-Subproject commit 6e137f66e7646a55ebb0681483b9c502249d0d84

src/utils/download.js

@@ -30,8 +30,7 @@ export const downloadPDFFile = function (url, fileName) {
 export const previewPDF = async (filename) => {
     const a = document.createElement("a"); //创建一个<a></a>标签
     // a.href = url; // 给a标签的href属性值加上地址，注意，这里是绝对路径，不用加 点.
-    a.href=(await getFileUrl(filename)).data 
-    debugger
+    a.href=(await getFileUrl(filename)).data
     a.target = "_blank";
     a.style.display = "none"; // 障眼法藏起来a标签
     document.body.appendChild(a); // 将a标签追加到文档对象中

src/utils/validate.js

@@ -15,9 +15,7 @@ export function isExternal(path) {
  * @returns {Boolean}
  */
 export function validUsername(str) {
-  // const valid_map = ['admin', 'editor']
-  // return valid_map.indexOf(str.trim()) >= 0
-  return str.trim().length>0
+  return str.length>0
 }
 
 /**

src/views/assets/administration/administrationselect.vue

@@ -387,6 +387,7 @@ export default {
     },
     //返回
     back() {
+      this.$store.dispatch("tagsView/delView", this.$route);
       this.$router.push("/administrationlsit");
     },
     //重置

src/views/assets/assetsUpedata.vue

@@ -266,6 +266,7 @@ export default {
     },
     // 返回
     back() {
+      this.$store.dispatch("tagsView/delView", this.$route);
       this.$router.push("/assetslist");
     },
     //重置

src/views/company/index.vue

@@ -113,7 +113,7 @@
                 >
                   <el-col :span="20">
                     <el-form-item label="确认密码" prop="staffPassword">
-                      <el-input type="password" v-model="passwordData.staffPassword"></el-input>
+                      <el-input type="password" v-model="passwordData.staffPassword" show-password></el-input>
                     </el-form-item>
                   </el-col>
                   <el-col :span="20">

src/views/contract/components/addContract.vue

@@ -36,7 +36,7 @@
                     </el-descriptions-item>
                     <el-descriptions-item label="合同编号" labelClassName="required" :disabled="isEdit">
                         <el-form-item prop="contractNumber">
-                            <el-input placeholder="请输入合同编号" v-model="formData.contractNumber"></el-input>
+                            <el-input placeholder="请输入合同编号" v-model="formData.contractNumber" :disabled="isEdit"></el-input>
                         </el-form-item>
                     </el-descriptions-item>
                     <el-descriptions-item label="合同类型" labelClassName="required">

src/views/expense/expenseList.vue

 <template>
-  <div>
+  <div v-loading="loading" element-loading-text="图片上传中。。。">
     <!-- 头部 -->
     <div class="QueryInvoice" style="margin: 10px 15px">
       <el-row :gutter="30">
@@ -172,7 +172,7 @@
     </div>
     <!-- 添加区域 -->
     <div class="getadd" v-show="!isgetid" style="margin-left: 5%">
-      <el-row v-loading="loading" element-loading-text="图片上传中。。。">
+      <el-row >
         <el-col :xl="8" :lg="10" :md="8" :sm="12" :xs="24">
           <el-form
             style="width: 100%; margin: 30px 0px"
@@ -247,7 +247,7 @@
             :on-remove="delfile"
             :on-success="fileSuccess"
             :limit="1"
-            :on-error="loading==true"
+            :on-error="geterror"
             style="margin-left: 90px"
           >
             <el-button
@@ -413,7 +413,6 @@ export default {
             this.total = res.data.total;
             res.data.list.forEach(e => {
               let fileNamepdf = e.filePath;
-              console.log(fileNamepdf);
               let fileType = fileNamepdf.substring(
                 fileNamepdf.lastIndexOf(".")
               );
@@ -459,7 +458,7 @@ export default {
       }
     },
     //时间处理
-    getFroms: function(value) {
+    getFroms(value) {
       var dt = new Date(value.time);
       let year = dt.getFullYear();
       let month = dt.getMonth() + 1;
@@ -546,6 +545,31 @@ export default {
       this.loading = false;
       this.isgetid = true;
       this.getincomeSelectlist();
+    },
+    //发票的删除操作
+    YesGet(row) {
+      deleteexpen(row)
+        .then(res => {
+          if (res.success) {
+            this.visible = false;
+            this.$message({
+              message: "发票删除成功",
+              type: "success"
+            });
+
+            this.getincomeSelectlist();
+          } else {
+            this.$message.error(res.msg);
+          }
+        })
+        .catch(e => {
+          console.log(e.msg);
+          this.$message.error(e.msg);
+        });
+    },
+
+    geterror() {
+      this.loading = true;
     }
   }
 };

src/views/login/index.vue

@@ -71,11 +71,10 @@
 </template>
 
 <script>
-import { validUsername } from "@/utils/validate";
 export default {
   data() {
     const validateUsername = (rule, value, callback) => {
-      if (!validUsername(value)) {
+      if (!(value)) {
         callback(new Error("请输入账号"));
       } else {
         callback();
@@ -88,7 +87,7 @@ export default {
       },
       loginRules: {
         username: [
-          { required: true, trigger: "blur", validator: validateUsername },
+          { required: true, trigger: "blur", message: "请输入账号" },
         ],
         password: [{ required: true, trigger: "blur", message: "请输入密码" }],
       },

src/views/pettyMoney/addPettyMoneyRecord.vue

@@ -112,8 +112,9 @@ export default {
     },
     methods: {
         back(){
-            this.$router.back();
             this.$store.dispatch("tagsView/delView", this.$route);
+            this.$router.back();
+            
         },
         addPettyMoneyRecord() {
             
@@ -129,7 +130,7 @@ export default {
                     if (this.isEdit) {
                         updatePettyMoneyRecord(params).then(res => {
                             if (res.success) {
-                                // this.addPettyFile(params.pettyId)
+                                //this.addPettyFile(params.pettyId)
                                 this.$message.success("修改成功")
                                 setTimeout(() => {
                                     this.$router.push('/pettyMoneyRecord')
@@ -141,6 +142,7 @@ export default {
                     } else {
                         insertPettyMoneyRecord(params).then(res => {
                             if (res.success) {
+
                                 this.addPettyFile(res.data)
                                 this.$message.success("申请成功")
                                 setTimeout(() => {
@@ -164,7 +166,8 @@ export default {
         },
         addPettyFile(pettyId) {
             this.fileParams.Id = pettyId
-            this.uploadChange && this.$refs.uploadPettyFile.submit()
+            this.fileParams.companyId = this.companyId
+            this.$refs.uploadPettyFile.submit()
         },
         handleDownload() {
             let { pettyEnclosure: filePath } = this.formData

src/views/pettyMoney/pettyMoneyRecord.vue

@@ -248,6 +248,7 @@ export default {
             revokePetty(params).then(res => {
                 if (res.success) {
                     this.$message.success("撤销成功")
+                    this.getPettyMoneyList()
                 } else {
                     this.$message.error("撤销失败")
                 }