1.修复部分bug;

2.删除单据编辑码详情页编辑弹窗审核时间;

src/views/product/UnitManage.vue

@@ -144,7 +144,8 @@
                                 <span>地址&nbsp;</span>
                             </div>
                             <el-form-item prop="addr">
-                                <el-input type="" v-model="editQuery.addr" style="width: 80%" auto-complete="off"></el-input>
+                                <el-input type="" v-model="editQuery.addr" style="width: 80%"
+                                          auto-complete="off"></el-input>
                             </el-form-item>
                         </div>
                     </el-col>
@@ -230,9 +231,8 @@ export default {
             },
 
             editQuery: {
-                unitId: null,
-                thirdId: null,
                 name: null,
+                thirdId: null,
                 creditNo: null,
                 pinyinCode: null,
                 contact: null,
@@ -302,12 +302,6 @@ export default {
             };
             this.getList();
         },
-        // 刷新表单
-        resetForm() {
-            this.$nextTick(() => {
-                this.$refs['editQuery'].resetFields();
-            });
-        },
         search() {
             this.query.page = 1;
             this.getList();
@@ -372,9 +366,17 @@ export default {
         handleAddClick() {
             this.editType = 0;
             this.editDialogVisible = true;
-            this.resetForm();
+            this.editQuery = {
-            var timestamp3 = new Date().getTime();
+                name: null,
-            this.editQuery.unitId = timestamp3;
+                thirdId: null,
+                creditNo: null,
+                pinyinCode: null,
+                contact: null,
+                mobile: null,
+                corpType: null,
+                addr: null,
+                unitId: new Date().getTime()
+            };
         },
 
         change() {

src/views/userManage/admin/authAdmin.vue

@@ -341,7 +341,15 @@ export default {
         resetForm() {
             this.$nextTick(() => {
                 if (this.formName === "add") {
-                    this.$refs["dataForm"].resetFields();
+                    this.formData = {
+                        userName: null,
+                        employeeName: null,
+                        passWord: null,
+                        checkPassword: null,
+                        comments: null,
+                        userFlag: 1,
+                        roles: null
+                    };
                 }
                 this.$refs["dataForm"].clearValidate();
             });

src/views/warehouse/codeReplace.vue

@@ -157,17 +157,6 @@
                 </el-date-picker>
             </el-row>
 
-            <el-row style="width: 100%; margin-top: 20px;">
-                <el-lable>审核时间：</el-lable>
-                <el-date-picker
-                    v-model="auditTime"
-                    type="datetime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    :picker-options="pickerOptions"
-                    placeholder="选择日期">
-                </el-date-picker>
-            </el-row>
-
             <div style="text-align: right; margin-top: 10px;">
                 <el-button type="primary" size="small" icon="search" @click="updateOrderInfo"
                 >提交
@@ -222,7 +211,14 @@
                 },
                 actDate: null,
                 auditTime: null,
-                editOrderVisible: false
+                editOrderVisible: false,
+                pickerOptions: {
+                    disabledDate: time => {
+                        let endDate = new Date().getTime();
+                        let nowDate = new Date(time).getTime();
+                        return (nowDate > endDate);
+                    }
+                }
             };
         },
         components: {
@@ -332,21 +328,18 @@
                 });
             },
             updateOrderInfo() {
-                if (this.actDate === null || this.auditTime === null) {
+                if (this.actDate === null || this.actDate === undefined) {
-                    this.$message.warning("创建时间和审核时间不能为空");
+                    this.$message.warning("创建时间不能为空");
-                    return;
-                } else if (this.actDate > this.auditTime) {
-                    this.$message.warning("请检查创建时间和审核时间是否正确");
                     return;
                 }
                 let data = {
                     actDate: this.actDate,
-                    auditTime: this.auditTime,
+                    orderIds: [this.query.orderId]
-                    orderIds: [this.query.corpOrderId]
                 };
                 updateOrderInfo(data).then((res) => {
                     if (res.code === 20000) {
                         this.$message.success("修改成功");
+                        this.getCodeList();
                     }
                 }).catch((error) => {
                 });

src/views/warehouse/errorCode.vue

@@ -339,6 +339,7 @@ export default {
         this.query = Object.assign(this.query, query);
         this.query.limit = parseInt(this.query.limit);
         this.query.corpOrderId = query.id;
+        this.query.code = null;
 
         // 加载表格数据
         this.getCodeList();

src/views/warehouse/ioErrorOrder.vue

@@ -146,13 +146,13 @@
         >
             <el-form :inline="true" :model="unitquery" class="query-form" size="mini">
                 <el-form-item class="query-form-item">
-                    <el-input v-model="unitquery.key" placeholder="搜索"></el-input>
+                    <el-input v-model="unitquery.key" placeholder="搜索" clearable></el-input>
                 </el-form-item>
                 <el-form-item>
                     <el-button
                         type="primary"
                         icon="search"
-                        @click.native.stop="getUnitList()"
+                        @click.native.stop="getUnitList(1)"
                     >查询
                     </el-button
                     >
@@ -347,8 +347,11 @@ export default {
             }).catch((error) => {
             });
         },
-        getUnitList() {
+        getUnitList(page) {
             this.loading = true;
+            if (page != null) {
+                this.unitquery.page = 1;
+            }
             unitListBykey(this.unitquery)
                 .then((response) => {
                     this.loading = false;

src/views/warehouse/stockOrderDelete.vue

@@ -232,7 +232,7 @@
                     limit: 10
                 },
                 detailQuery: {
-                    orderIdFk: "",
+                    orderId: null,
                     page: 1,
                     limit: 20
                 },
@@ -354,7 +354,6 @@
             getOrderDetailList(row) {
                 if (this.$isNotBlank(row)) {
                     this.detailQuery.orderId = row.orderId;
-                    this.detailQuery.orderIdFk = row.orderId;
                 }
                 this.detailLoading = true;
                 orderDetail(this.detailQuery)