1.修改单据复制功能页面

2.调整第三方系统编辑页面
3.修改单据编辑页面

src/api/inout/order.js

@@ -339,3 +339,12 @@ export function updateOrderInfo(data) {
         data: data
     })
 }
+
+
+export function getOrderById(params) {
+    return axios({
+        url: "/udiwms/inout/order/getOrderById",
+        method: "get",
+        params: params
+    })
+}

src/views/basic/BasicThirdSys.vue

@@ -434,9 +434,9 @@ export default {
             },
             dataMap: {
                 0: "接口实时获取",
-                1: "文件缓存",
+                1: "文件方式",
                 2: "第三方上传缓存",
-                3: "接口本地缓存"
+                3: "接口方式"
             },
             formMap: {
                 edit: "编辑",

src/views/basic/BasicThirdSysDetailModify.vue

@@ -17,9 +17,9 @@
                     <el-radio-group v-model="inputDetailQuery.fromType" :disabled="!inputDetailQuery.enabled"
                                     style="margin-right: 20px" @change="agreeChange">
                         <el-radio-button :label="0" size="mini" disabled>接口实时获取</el-radio-button>
-                        <el-radio-button :label="3" size="mini">接口本地缓存</el-radio-button>
+                        <el-radio-button :label="3" size="mini">接口方式</el-radio-button>
                         <el-radio-button :label="2" size="mini" disabled>第三方上传缓存</el-radio-button>
-                        <el-radio-button :label="1" size="mini">文件缓存</el-radio-button>
+                        <el-radio-button :label="1" size="mini">文件方式</el-radio-button>
 
                     </el-radio-group>
                     <!--<el-checkbox :disabled="inputDetailQuery.fromType!=0 || !inputDetailQuery.enabled"-->

src/views/basic/BasicThirdSysModify.vue

@@ -57,12 +57,12 @@
         <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="18" class="el-col">
                 <div class="text item">
-                    <div class="itemTag">
+                    <div class="itemTag" style="width: 200px;">
                         <span>第三方服务IP地址:&nbsp;</span>
                     </div>
 
                     <el-input
-                        style="width: 70%"
+                        style="width: 70%; margin-left: -80px;"
                         size="mini"
                         splaceholder="请输入内容"
                         v-model="inputQuery.thridUrl"
@@ -74,12 +74,12 @@
         <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="18" class="el-col">
                 <div class="text item">
-                    <div class="itemTag">
+                    <div class="itemTag" style="width: 200px;">
                         <span>第三方系统IP地址:&nbsp;</span>
                     </div>
 
                     <el-input
-                        style="width: 70%"
+                        style="width: 70%;margin-left: -80px;"
                         size="mini"
                         splaceholder="请输入内容"
                         v-model="inputQuery.thirdSysUrl"
@@ -116,13 +116,18 @@
         <el-row :gutter="20" class="el-row" type="flex">
             <el-col :span="18" class="el-col">
                 <div class="text item">
-                    <div class="itemTag">
+                    <div class="itemTag" style="width: 200px;">
                         <span>第三方服务接口授权:&nbsp;</span>
                     </div>
-
+                </div>
+            </el-col>
+        </el-row>
+        <el-row :gutter="20" class="el-row" type="flex">
+            <el-col :span="18" class="el-col" style="margin-left: 60px;">
+                <div class="text item">
                     <label>apikey：</label>
                     <el-input
-                        style="width: 40%; margin-right: 10px;"
+                        style="width: 40%; margin-right: 10px; margin-left: 10px;"
                         size="mini"
                         splaceholder="请输入内容"
                         v-model="inputQuery.apikey"

src/views/business/DialogcChangeNewOrder.vue

@@ -154,6 +154,37 @@
                 </el-col>
             </el-row>
         </el-form>
+
+
+        <el-table v-loading="detailLoading"
+                  :data="detailList"
+                  @selection-change="changeFun"
+                  style="width: 100%; margin-top: 20px;">
+            <el-table-column label="产品通用名" width="200" prop="productName"></el-table-column>
+            <el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
+            <el-table-column label="批次号" width="100" prop="batchNo"></el-table-column>
+
+            <el-table-column label="生产日期" width="120" prop="productDate"></el-table-column>
+            <el-table-column label="失效日期" width="120" prop="expireDate"></el-table-column>
+            <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
+            <el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
+            <el-table-column label="价格" width="120" prop="price"></el-table-column>
+            <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo"></el-table-column>
+            <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo"></el-table-column>
+            <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo"></el-table-column>
+            <el-table-column label="发票日期" width="150" prop="invoiceDate"></el-table-column>
+            <el-table-column label="操作" width="100" prop="price" fixed="right">
+                <template slot-scope="scope">
+                    <el-button
+                        type="text"
+                        size="small"
+                        @click="deleteOrderDetail(scope.$index, scope.row)"
+                    >删除
+                    </el-button>
+                </template>
+            </el-table-column>
+        </el-table>
+
     </div>
 </template>
 
@@ -162,7 +193,7 @@ import {filterAllByLoc, filterAllByUser} from "@/api/basic/invWarehouse";
 import {getBasicUnitMaintains} from "@/api/basic/basicUnitMaintain";
 import {parseTime} from "@/filtres";
 import {getLocalJoinByUser} from "@/api/basic/busLocalType";
-import {stockOrderChange} from "@/api/inout/stockOrder";
+import {stockOrderChange, stockOrderDetail} from "@/api/inout/stockOrder";
 
 export default {
     name: "DialogcChangeNewOrder",
@@ -328,6 +359,28 @@ export default {
                 .catch(() => {
                 });
         },
+        getStockOrderDetailList(orderId) {
+            let query = {
+                orderIdFk: orderId
+            }
+            stockOrderDetail(query)
+                .then((response) => {
+                    this.detailLoading = false;
+                    this.detailList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.detailLoading = false;
+                    this.detailList = [];
+                });
+        },
+        deleteOrderDetail(index) {
+            for (let i = 0; i < this.detailList.length; i++) {
+                if (index === i) {
+                    this.detailList.splice(index, 1);
+                    break
+                }
+            }
+        }
 
     },
     created() {
@@ -337,6 +390,7 @@ export default {
         }
         this.getBusType();
         this.getStorage();
+        this.getStockOrderDetailList(this.curRow.id);
     }
 }
 </script>

src/views/business/codeReplace.vue

@@ -11,6 +11,10 @@
                     >查询
                     </el-button
                     >
+                    <el-button type="primary" icon="search" @click="editOrderTime"
+                    >编辑
+                    </el-button
+                    >
                 </el-button-group>
             </el-form-item>
         </el-form>
@@ -41,7 +45,7 @@
                         type="text"
                         @click.native.stop="replaceCodes(scope.row)"
                     >
-                        删除
+                        减一
                     </el-button>
                 </template>
             </el-table-column>
@@ -132,11 +136,53 @@
                 >
             </div>
         </el-dialog>
+
+        <el-dialog
+            title="修改时间"
+            :visible.sync="editOrderVisible"
+            width="35%"
+            append-to-body
+            v-if="editOrderVisible"
+        >
+
+            <el-row style="width: 100%">
+                <el-lable>创建时间：</el-lable>
+                <el-date-picker
+                    v-model="actDate"
+                    type="datetime"
+                    value-format="yyyy-MM-dd HH:mm:ss"
+                    :picker-options="pickerOptions"
+                    placeholder="选择日期时间">
+                </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"
+                >提交
+                </el-button
+                >
+                <el-button type="primary" size="small" icon="search" @click="cancelEdit"
+                >取消
+                </el-button
+                >
+            </div>
+        </el-dialog>
     </div>
 </template>
 
 <script>
-    import {codeList} from "../../api/inout/order";
+    import {codeList, updateOrderInfo, getOrderById} from "../../api/inout/order";
     import draggable from "vuedraggable";
     import {replaceCodes} from "../../api/basic/invWarehouse";
 
@@ -172,7 +218,10 @@
                     newCode: null,
                     newCount: null,
                     orderId: null
-                }
+                },
+                actDate: null,
+                auditTime: null,
+                editOrderVisible: false
             };
         },
         components: {
@@ -243,7 +292,7 @@
                 };
             },
             replaceCodes(row) {
-                this.$confirm("是否确认删除条码和相关库存单据数据", "提示", {
+                this.$confirm("是否确认库存减一", "提示", {
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
@@ -252,10 +301,10 @@
                         code: row.code,
                         count: row.count,
                         orderId: row.orderId
-                    }
+                    };
                     replaceCodes(this.codeDetail).then((res) => {
                         if (res.code === 20000) {
-                            this.$message.success("删除成功");
+                            this.$message.success("操作成功");
                             this.getCodeList();
                         } else {
                             this.$message.error(res.message);
@@ -266,9 +315,48 @@
                 }).catch(() => {
                     this.$message({
                         type: 'info',
-                        message: '已取消删除'
+                        message: '已取消操作'
                     });
                 });
+            },
+            editOrderTime() {
+                let getOrderDataParam = {
+                    id: this.query.corpOrderId,
+                };
+                getOrderById(getOrderDataParam).then((res) => {
+                    this.actDate = res.data.actDate;
+                    this.auditTime = res.data.auditTime;
+                    this.editOrderVisible = true;
+                }).catch((error) => {
+                });
+            },
+            updateOrderInfo() {
+                if (this.actDate === null || this.auditTime === null) {
+                    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.corpOrderId]
+                };
+                updateOrderInfo(data).then((res) => {
+                    if (res.code === 20000) {
+                        this.$message.success("修改成功");
+                    }
+                }).catch((error) => {
+                });
+                this.actDate = null;
+                this.auditTime = null;
+                this.editOrderVisible = false;
+            },
+            cancelEdit() {
+                this.editOrderVisible = false;
+                this.actDate = null;
+                this.auditTime = null;
             }
         },
         filters: {},

src/views/business/stockOrderDelete.vue

@@ -16,7 +16,8 @@
                         <el-button-group>
                             <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
                             <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-                            <el-button type="primary" icon="search" @click="deleteAllOrder">一键删除</el-button>
+                            <el-button type="primary" icon="search" @click="deleteAllOrder">全部删除</el-button>
+                            <el-button type="primary" icon="search" @click="editAllOrderTime">编辑</el-button>
                         </el-button-group>
                     </el-form-item>
                 </el-row>
@@ -32,7 +33,6 @@
                 @selection-change="handleSelectionChange"
                 :row-class-name="tableRowClassName"
             >
-                <el-table-column type="selection" width="55"></el-table-column>
                 <el-table-column label="序号" type="index"></el-table-column>
                 <el-table-column label="扫码单据类型" prop="action">
                     <template slot-scope="scope">
@@ -92,18 +92,11 @@
                 </el-table-column>
                 <el-table-column label="操作" fixed="right" width="150">
                     <template slot-scope="scope">
-                        <el-button
-                            type="text"
-                            size="small"
-                            @click.native.stop="handleEdit(scope.row)"
-                        >编辑
-                        </el-button
-                        >
                         <el-button
                             type="text"
                             size="small"
                             @click.native.stop="intentDetail(scope.row)"
-                        >详情
+                        >编辑
                         </el-button
                         >
                         <el-button
@@ -189,7 +182,7 @@
         </el-card>
 
         <el-dialog
-            title="单号详情"
+            title="详情"
             :visible.sync="codeDetailVisible"
             width="80%"
             v-if="codeDetailVisible"
@@ -208,19 +201,20 @@
         </el-dialog>
 
         <el-dialog
-            title="编辑单据"
+            title="修改时间"
             :visible.sync="editOrderVisible"
-            width="25%"
+            width="35%"
             v-if="editOrderVisible"
         >
+
             <el-row style="width: 100%">
                 <el-lable>创建时间：</el-lable>
                 <el-date-picker
                     v-model="actDate"
-                    type="date"
+                    type="datetime"
-                    value-format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     :picker-options="pickerOptions"
-                    placeholder="选择日期">
+                    placeholder="选择日期时间">
                 </el-date-picker>
             </el-row>
 
@@ -228,8 +222,8 @@
                 <el-lable>审核时间：</el-lable>
                 <el-date-picker
                     v-model="auditTime"
-                    type="date"
+                    type="datetime"
-                    value-format="yyyy-MM-dd"
+                    value-format="yyyy-MM-dd HH:mm:ss"
                     :picker-options="pickerOptions"
                     placeholder="选择日期">
                 </el-date-picker>
@@ -313,9 +307,7 @@
                 codeDetailVisible: false,
                 editOrderVisible: false,
                 actDate: null, //创建时间
-                actDate2: null, //时分秒
                 auditTime: null, //审核时间
-                auditTime2: null,//时分秒
                 orderIds: [],
                 pickerOptions: {
                     disabledDate: time => {
@@ -368,6 +360,7 @@
                 }
             },
             getList() {
+                this.query.billNo = this.query.billNo.trim();
                 if (this.query.billNo === null || this.query.billNo === "") {
                     this.$message.warning("请输入需要查询的单号");
                 } else {
@@ -503,6 +496,14 @@
                     });
                 })
             },
+            editAllOrderTime() {
+                if (this.query.billNo === null || this.query.billNo === "" || this.list.length === 0) {
+                    return;
+                }
+                this.actDate = null;
+                this.auditTime = null;
+                this.editOrderVisible = true;
+            },
             intentDetail(row) {
                 this.codeDetailVisible = true;
                 this.idQuery.id = row.id;
@@ -528,8 +529,6 @@
                 this.list.forEach(item => {
                     this.orderIds.push(item.id);
                 });
-                this.actDate = this.actDate + " " + this.actDate2;
-                this.auditTime = this.auditTime + " " + this.auditTime2;
                 let data = {
                     actDate: this.actDate,
                     auditTime: this.auditTime,