فهرست منبع

修复日期问题

caojunjie 3 سال پیش
والد
کامیت
4e846b0e46

+ 1 - 2
src/combination/formComponent.vue

@@ -50,7 +50,7 @@
           :style="{ width: item.width + 'px' }"
           v-model="form[item.label]"
           type="daterange"
-          value-format="yyyy-MM-dd"
+          value-format="yyyy-MM-dd HH:mm:ss"
           :default-time="['00:00:00', '23:59:59']"
           range-separator="至"
           start-placeholder="开始日期"
@@ -79,7 +79,6 @@ export default {
       this.$emit('returnToForm', this.form)
     },
     assignmentTime(formLi){
-      console.log(formLi)
       this.$set(this,'form',formLi)
     },
     spellNumbers(name){

+ 7 - 4
src/views/purchaseIssue/index.vue

@@ -128,7 +128,6 @@
             <div style="width: 200px;height: 20px;font-size: 14px;">出库日期:{{ formList.fBsdate }}</div>
           </div>
           <div style="display: flex;justify-content: space-between;margin-bottom: 10px">
-            <div style="width: 200px;height: 20px;font-size: 14px;">发货人:</div>
             <div style="width: 200px;height: 20px;font-size: 14px;">公司电话:{{ formList.fsbuTel }}</div>
             <div style="width: 200px;height: 20px;font-size: 14px;">编号:{{ formList.fBillno }}</div>
           </div>
@@ -1055,7 +1054,7 @@ export default {
     //查询公司
     fCompany(name) {
       company(name).then(res => {
-        console.log(res)
+        // console.log(res)
         if (name == 3) {
           this.dataList.fCorpid = []
           for (let item in res.data) {
@@ -1729,8 +1728,12 @@ export default {
       } else if (res == '搜索') {
         this.$refs.avatar.submitForm()
       } else if (res == '重置') {
-        this.$refs.avatar.form = {}
-        this.formDataList.pageNum = 1
+        this.formDataList = {
+          pageNum:1,
+          pageSize:10,
+          timeInterval:null
+        }
+        this.$refs.avatar.assignmentTime(this.formDataList)
         this.$refs.avatar.submitForm()
       }
     },

+ 7 - 3
src/views/purchaseRequest/index.vue

@@ -1659,8 +1659,12 @@ export default {
       } else if (res == '搜索') {
         this.$refs.avatar.submitForm()
       } else if (res == '重置') {
-        this.$refs.avatar.form = {}
-        this.formDataList.pageNum = 1
+        this.formDataList = {
+          pageNum:1,
+          pageSize:10,
+          timeInterval:null
+        }
+        this.$refs.avatar.assignmentTime(this.formDataList)
         this.$refs.avatar.submitForm()
       }
     },
@@ -1716,7 +1720,7 @@ export default {
   text-align: center;
   vertical-align: middle;
   font-size: 14px;
-  color: #333333;
+  color: #000000;
   padding: 8px 12px;
 }
 

+ 20 - 0
src/views/warehouse/inStock/index.vue

@@ -1909,7 +1909,27 @@ export default {
 .app-container ::v-deep .el-form-item {
   margin-bottom: 4px;
 }
+.table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  background-color: transparent;
+  display: table;
+  width: 100%;
+  max-width: 100%;
+  margin: 0 auto;
+}
+
+.table td {
+  text-align: center;
+  vertical-align: middle;
+  font-size: 14px;
+  color: #000000;
+  padding: 8px 12px;
+}
 
+.column {
+  border: 1px solid #000;
+}
 .app-container ::v-deep .el-table__body-wrapper {
   z-index: 2;
 }

+ 1 - 1
src/views/warehouse/outStock/index.vue

@@ -1924,7 +1924,7 @@ export default {
   text-align: center;
   vertical-align: middle;
   font-size: 14px;
-  color: #333333;
+  color: #000000;
   padding: 8px 12px;
 }