diff --git a/src/views/inout/DialogcChangeNewOrder.vue b/src/views/inout/DialogcChangeNewOrder.vue
index 7ea1240b..54684fbe 100644
--- a/src/views/inout/DialogcChangeNewOrder.vue
+++ b/src/views/inout/DialogcChangeNewOrder.vue
@@ -33,38 +33,33 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-
         <el-col :span="11">
-          <el-form-item class="query-form-item" prop="billType" label="单据类型">
-            <el-select v-model="formData.action" placeholder="请选择单据类型" style="width: 90%"
-                       @change="actionChange">
+          <el-form-item prop="locStorageCode" label="当前仓库">
+            <el-select v-model="formData.invCode" placeholder="当前仓库信息" @change="locCHange" style="width: 90%">
               <el-option
-                v-for="item in busTypeOptions"
+                v-for="item in curInvOptions"
                 :key="item.name"
                 :label="item.name"
-                :value="item.action">
+                :value="item.code">
                 <span style="float: left">{{ item.name }}</span>
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
-
-
         <el-col :span="11">
-          <el-form-item prop="locStorageCode" label="当前仓库">
-            <el-select v-model="formData.invCode" placeholder="当前仓库信息" @change="locCHange" style="width: 90%">
+          <el-form-item class="query-form-item" prop="billType" label="单据类型">
+            <el-select v-model="formData.action" placeholder="请选择单据类型" style="width: 90%"
+                       @change="actionChange">
               <el-option
-                v-for="item in curInvOptions"
+                v-for="item in busTypeOptions"
                 :key="item.name"
                 :label="item.name"
-                :value="item.code">
+                :value="item.action">
                 <span style="float: left">{{ item.name }}</span>
               </el-option>
             </el-select>
           </el-form-item>
         </el-col>
-
-
       </el-row>
       <el-row :gutter="20">
         <el-col :span="11">
@@ -125,10 +120,7 @@
             ></el-input>
           </el-form-item>
         </el-col>
-
       </el-row>
-
-
     </el-form>
 
     <el-table v-loading="detailLoading"
@@ -200,7 +192,7 @@ import {getLocalJoinByUser} from "@/api/basic/busLocalType";
 import {submitOrderWeb} from "@/api/inout/order";
 import {orderChange} from "@/api/inout/order";
 import {getBizDetailList} from "@/api/inout/orderDetailBiz";
-import {filterSubByInv, findInvByUser} from "@/api/system/invSubWarehouse";
+import {filterSubByInv, findByFrom, findInvByUser} from "@/api/system/invSubWarehouse";
 import {isBlank} from "@/utils/strUtil";
 import {convertDate} from "@/utils/date"
 import {findByInvUser} from "@/api/basic/busType";
@@ -231,6 +223,10 @@ export default {
         fromType: 2,
         actDate: new Date(),
         action: null,
+
+        fromInvCode: null,
+
+
         locStorageCode: null,
         fromSubInvCode: null,
         invWarehouseCode: null,
@@ -289,7 +285,7 @@ export default {
       let products = [];
       this.detailList.forEach(item => {
         let product = {
-          relId: item.relId,
+          relId: item.bindRlFk,
           batchNo: item.batchNo
         };
         products.push(product);
@@ -421,12 +417,12 @@ export default {
       this.curAction = this.getActionItem(item);
       if (this.curAction.corpType == 0 || this.curAction.corpType == 2 || (this.curAction.corpType == 1 && !this.curAction.genUnit)) {
         //1.切换往来单位
-        this.orderFormData.fromCorp = null;
+        this.formData.fromCorp = null;
         this.findMethod();
 
       } else if (this.curAction.corpType == 3) {
         //2. 切换往来仓库
-        this.orderFormData.fromInvCode = null;
+        this.formData.fromInvCode = null;
         this.findFromInvList();
       }
     },
@@ -438,6 +434,22 @@ export default {
       }
     },
 
+    //获取往来仓库列表
+    findFromInvList(val) {
+      let cQuery = {
+        locInvCode: this.formData.invCode,
+      };
+      findByFrom(cQuery)
+        .then((response) => {
+          this.fromInvOptions = response.data || [];
+          if (val == 1) {
+            this.formData.fromInvCode = this.fromInvOptions[0].code;
+          }
+        })
+        .catch(() => {
+        });
+    },
+
     changeFun(row) {
       let _this = this;
       _this.multipId = []; //每次改动重置ID
diff --git a/src/views/inout/IoAuditedOrder.vue b/src/views/inout/IoAuditedOrder.vue
index caf5c948..0797bbbb 100644
--- a/src/views/inout/IoAuditedOrder.vue
+++ b/src/views/inout/IoAuditedOrder.vue
@@ -173,13 +173,6 @@
             </el-button>
 
 
-            <!--            <el-button-->
-            <!--              type="text"-->
-            <!--              size="small"-->
-            <!--              @click.native.stop="deleteDialog(scope.row)"-->
-            <!--            >删除-->
-            <!--            </el-button-->
-            <!--            >-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/purchase/purOrder/purOrder.vue b/src/views/purchase/purOrder/purOrder.vue
index 84045529..d1dd98fd 100644
--- a/src/views/purchase/purOrder/purOrder.vue
+++ b/src/views/purchase/purOrder/purOrder.vue
@@ -126,6 +126,7 @@
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+        <el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
         <el-table-column label="申购数量" prop="count"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
diff --git a/src/views/purchase/purOrder/purOrderAudit.vue b/src/views/purchase/purOrder/purOrderAudit.vue
index 887dcc7e..5f1b8579 100644
--- a/src/views/purchase/purOrder/purOrderAudit.vue
+++ b/src/views/purchase/purOrder/purOrderAudit.vue
@@ -124,6 +124,7 @@
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+        <el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
         <el-table-column label="申购数量" prop="count"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
diff --git a/src/views/purchase/purOrder/purOrderDetailDialog.vue b/src/views/purchase/purOrder/purOrderDetailDialog.vue
index ed342193..b2fabf3e 100644
--- a/src/views/purchase/purOrder/purOrderDetailDialog.vue
+++ b/src/views/purchase/purOrder/purOrderDetailDialog.vue
@@ -1,505 +1,511 @@
 <template>
-    <div>
+  <div>
 
-        <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
-            <el-row type="flex" justify="end" v-if="editType == 1">
-                <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
-                    <el-button type="primary" @click.native="saveOrder('3')" :loading="loading">审核通过</el-button>
-                    <el-button type="primary" @click.native="saveOrder('4')" :loading="loading">拒绝申请</el-button>
-                </el-button-group>
-            </el-row>
+    <el-form :model="formData" :rules="formRules" ref="dataForm" label-width="120px">
+      <el-row type="flex" justify="end" v-if="editType == 1">
+        <el-button-group style="display: flex;margin-bottom: 15px; margin-right: 50px">
+          <el-button type="primary" @click.native="saveOrder('3')" :loading="loading">审核通过</el-button>
+          <el-button type="primary" @click.native="saveOrder('4')" :loading="loading">拒绝申请</el-button>
+        </el-button-group>
+      </el-row>
 
-            <el-card style="margin-top: -5px;">
-                <el-row>
-                    <el-col  :span="11">
-                        <el-form-item label="采购单号:"  prop="billNo">
-                            <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="11">
-                        <el-form-item label="创建时间:"  prop="createTime">
-                            <el-date-picker
-                                :disabled="true"
-                                v-model="formData.createTime"
-                                type="datetime"
-                                placeholder="选择日期"
-                                style="width: 90%"
-                                :clearable="false"
-                                value-format="yyyy-MM-dd HH:mm:ss"
-                            >
-                            </el-date-picker>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-              <el-row style="margin-top: -10px">
-                <el-col :span="11">
-                  <el-form-item label="紧急程度:" prop="emergency">
-                    <el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%" clearable>
-                      <el-option label="正常" :value=1></el-option>
-                      <el-option label="较急" :value=2></el-option>
-                      <el-option label="特急" :value=3></el-option>
-                    </el-select>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="11">
-                  <el-form-item label="到货截止:" prop="arrivalTime">
-                    <el-date-picker
-                      :disabled="true"
-                      v-model="formData.arrivalTime"
-                      type="datetime"
-                      placeholder="选择日期"
-                      style="width: 90%"
-                      :clearable="false"
-                      value-format="yyyy-MM-dd HH:mm:ss"
-                    >
-                    </el-date-picker>
-                  </el-form-item>
-                </el-col>
-              </el-row>
-                <el-row>
-                    <el-col :span="11">
-                        <el-form-item label="采购仓库:"  prop="locStorageCode">
-                            <el-select v-model="formData.invName" placeholder="采购仓库信息"  style="width: 90%"
-                                       :disabled="true" clearable>
-                                <el-option
-                                    v-for="item in subInvList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="11">
-                        <el-form-item label="审核说明:"  prop="billNo">
-                            <el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea" autosize></el-input>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
+      <el-card style="margin-top: -5px;">
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="采购单号:" prop="billNo">
+              <el-input v-model="formData.billNo" style="width: 90%" auto-complete="off" :disabled="true"></el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="创建时间:" prop="createTime">
+              <el-date-picker
+                :disabled="true"
+                v-model="formData.createTime"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 90%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row style="margin-top: -10px">
+          <el-col :span="11">
+            <el-form-item label="紧急程度:" prop="emergency">
+              <el-select v-model="formData.emergency" :disabled="true" placeholder="请选择紧急程度" style="width: 90%"
+                         clearable>
+                <el-option label="正常" :value=1></el-option>
+                <el-option label="较急" :value=2></el-option>
+                <el-option label="特急" :value=3></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="到货截止:" prop="arrivalTime">
+              <el-date-picker
+                :disabled="true"
+                v-model="formData.arrivalTime"
+                type="datetime"
+                placeholder="选择日期"
+                style="width: 90%"
+                :clearable="false"
+                value-format="yyyy-MM-dd HH:mm:ss"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="采购仓库:" prop="locStorageCode">
+              <el-select v-model="formData.invName" placeholder="采购仓库信息" style="width: 90%"
+                         :disabled="true" clearable>
+                <el-option
+                  v-for="item in subInvList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="审核说明:" prop="billNo">
+              <el-input v-model="formData.auditRemark" style="width: 90%" auto-complete="off" type="textarea"
+                        autosize></el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-                <el-row>
-                    <el-col :span="11">
-                        <el-form-item label="采购说明:"  prop="billNo">
-                            <el-input v-model="formData.remark"   style="width: 90%":disabled="true" auto-complete="off" type="textarea" autosize></el-input>
-                        </el-form-item>
-                    </el-col>
-<!--                    <el-col :span="11">-->
-<!--                        <el-form-item>-->
-<!--                            <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>-->
-<!--                        </el-form-item>-->
-<!--                    </el-col>-->
+        <el-row>
+          <el-col :span="11">
+            <el-form-item label="采购说明:" prop="billNo">
+              <el-input v-model="formData.remark" style="width: 90%" :disabled="true" auto-complete="off"
+                        type="textarea" autosize></el-input>
+            </el-form-item>
+          </el-col>
+          <!--                    <el-col :span="11">-->
+          <!--                        <el-form-item>-->
+          <!--                            <el-checkbox v-model="formData.autoPurchase">是否生成采购入库单</el-checkbox>-->
+          <!--                        </el-form-item>-->
+          <!--                    </el-col>-->
 
-                </el-row>
-                <el-row  v-show="formData.autoPurchase">
-                    <el-col :span="11">
-                        <el-form-item label="入库仓库:"  prop="locStorageCode">
-                            <el-select v-model="formData.targetSubInv" placeholder="入库仓库信息"  style="width: 90%" @change="targetInvChange" clearable>
-                                <el-option
-                                    v-for="item in tarSubList"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.code">
-                                    <span style="float: left">{{ item.name }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="11">
-                        <el-form-item label="入库单据类型:"  class="query-form-item" prop="targetBillAction">
-                            <el-select v-model="formData.targetBillAction" placeholder="请选择单据类型"  style="width: 90%">
-                                <el-option
-                                    v-for="item in busTypes"
-                                    :key="item.name"
-                                    :label="item.name"
-                                    :value="item.action">
-                                    <span style="float: left">{{ item.name }}</span>
-                                </el-option>
-                            </el-select>
-                        </el-form-item>
-                    </el-col>
+        </el-row>
+        <el-row v-show="formData.autoPurchase">
+          <el-col :span="11">
+            <el-form-item label="入库仓库:" prop="locStorageCode">
+              <el-select v-model="formData.targetSubInv" placeholder="入库仓库信息" style="width: 90%"
+                         @change="targetInvChange" clearable>
+                <el-option
+                  v-for="item in tarSubList"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.code">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="11">
+            <el-form-item label="入库单据类型:" class="query-form-item" prop="targetBillAction">
+              <el-select v-model="formData.targetBillAction" placeholder="请选择单据类型" style="width: 90%">
+                <el-option
+                  v-for="item in busTypes"
+                  :key="item.name"
+                  :label="item.name"
+                  :value="item.action">
+                  <span style="float: left">{{ item.name }}</span>
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
 
 
-                </el-row>
-            </el-card>
+        </el-row>
+      </el-card>
 
-            <el-card>
-                <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border highlight-current-row max-height="300" height="300" ref="multipleTable">
-                  <el-table-column label="序号" type="index" width="60"></el-table-column>
-                  <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
-                  <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
-                  <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
-                  <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
-                  <el-table-column width="150" label="采购数量">
-                    <template slot-scope="scope">
-                      <el-input size="small" v-model="scope.row.count"
-                                placeholder="请输入数量" style="width: 80%"
-                                type='number'
-                                @change="tableCountChange(scope.row)"
-                                :disabled="scope.row.index !== selectedIndex"
-                                oninput="value=value.replace(/[^\d]/g,'')"></el-input>
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
-                  <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
-                  <el-table-column label="供应商" prop="supName"></el-table-column>
-                </el-table>
-            </el-card>
-        </el-form>
+      <el-card>
+        <el-table v-loading="loading" :data="codeArray" style="width: 100%;" :row-class-name="tableRowClassName" border
+                  highlight-current-row max-height="300" height="300" ref="multipleTable">
+          <el-table-column label="序号" type="index" width="60"></el-table-column>
+          <el-table-column label="DI/物资编码" prop="nameCode"></el-table-column>
+          <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
+          <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+          <el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
+          <el-table-column width="150" label="采购数量">
+            <template slot-scope="scope">
+              <el-input size="small" v-model="scope.row.count"
+                        placeholder="请输入数量" style="width: 80%"
+                        type='number'
+                        @change="tableCountChange(scope.row)"
+                        :disabled="scope.row.index !== selectedIndex"
+                        oninput="value=value.replace(/[^\d]/g,'')"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
+          <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
+          <el-table-column label="供应商" prop="supName"></el-table-column>
+        </el-table>
+      </el-card>
+    </el-form>
 
-        <el-dialog
-            title="产品录入"
-            :visible.sync="selectProductVisible"
-            :close-on-click-modal="false"
-            :close-on-press-escape="false"
-            width="80%"
-            v-if="selectProductVisible"
-            :append-to-body='true'
-        >
-            <purPlanProducts
-                :closeDialog="closeDialogC2"
-                :data="thisData"
-                :purType="1"
-            ></purPlanProducts>
-        </el-dialog>
-    </div>
+    <el-dialog
+      title="产品录入"
+      :visible.sync="selectProductVisible"
+      :close-on-click-modal="false"
+      :close-on-press-escape="false"
+      width="80%"
+      v-if="selectProductVisible"
+      :append-to-body='true'
+    >
+      <purPlanProducts
+        :closeDialog="closeDialogC2"
+        :data="thisData"
+        :purType="1"
+      ></purPlanProducts>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
 import draggable from "vuedraggable";
 import purPlanProducts from "@/views/purchase/purPlan/purOrderSelectProduct";
 import {auditOrder, delOrderDetail, listOrderDetail} from "@/api/purchase/purOrder";
-import {filterAllByUser,selectByCode} from "@/api/system/invWarehouse";
+import {filterAllByUser, selectByCode} from "@/api/system/invWarehouse";
 import {filterSubByInv} from "@/api/system/invSubWarehouse";
 import {getLocalJoinByUser} from "@/api/basic/busType";
 import {parseTime} from "@/utils/coTools";
 
 export default {
-    name: "idQuery",
-    props: {
-        closeDialog: {
-            type: Function,
-            required: true,
-        },
-        idQuery: {
-            type: Object,
-            required: true,
-        },
-        editType: {
-            type: Object,
-            required: true,
-        },
+  name: "idQuery",
+  props: {
+    closeDialog: {
+      type: Function,
+      required: true,
     },
-    data() {
-        return {
-            code: "",
-            query: {
-                orderIdFk: "",
-                page: 1,
-                limit: 10,
-            },
-            formData: {
-                id: null,
-                billNo: null,
-                createTime: "",
-                remark: "",
-                deptCode: null,
-                locStorageCode: null,
-                invWarehouseCode: null,
-                auditRemark: null,
-                autoPurchase: false,
-                targetInv: 1000,
-                targetSubInv: null,
-                targetBillAction: null,
-            },
-            formRules: {},
-            codeArray: [],
-            total: 0,
-            loading: false,
-            index: null,
-            formLoading: false,
-            formVisible: false,
-            deleteLoading: false,
-            orderNo: null,
-            statusMap: {
-                1: "草稿",
-                2: "未审核",
-                3: "已审核",
-            },
-            typeMap: {
-                1: "预入库",
-                2: "普通采购",
-            },
-            orderEditor: true,
-            sOptions: [],
-            sValue: [],
-            sList: [],
-            sLoading: false,
-            busTypes: [],
-            currentRow: {},
-            selectedIndex: "",
-            selectProductVisible: false,
-            thisData: {},
-            subInvList: [],
-            tarSubList: [],
-            invQueryData: {},
+    idQuery: {
+      type: Object,
+      required: true,
+    },
+    editType: {
+      type: Object,
+      required: true,
+    },
+  },
+  data() {
+    return {
+      code: "",
+      query: {
+        orderIdFk: "",
+        page: 1,
+        limit: 10,
+      },
+      formData: {
+        id: null,
+        billNo: null,
+        createTime: "",
+        remark: "",
+        deptCode: null,
+        locStorageCode: null,
+        invWarehouseCode: null,
+        auditRemark: null,
+        autoPurchase: false,
+        targetInv: 1000,
+        targetSubInv: null,
+        targetBillAction: null,
+      },
+      formRules: {},
+      codeArray: [],
+      total: 0,
+      loading: false,
+      index: null,
+      formLoading: false,
+      formVisible: false,
+      deleteLoading: false,
+      orderNo: null,
+      statusMap: {
+        1: "草稿",
+        2: "未审核",
+        3: "已审核",
+      },
+      typeMap: {
+        1: "预入库",
+        2: "普通采购",
+      },
+      orderEditor: true,
+      sOptions: [],
+      sValue: [],
+      sList: [],
+      sLoading: false,
+      busTypes: [],
+      currentRow: {},
+      selectedIndex: "",
+      selectProductVisible: false,
+      thisData: {},
+      subInvList: [],
+      tarSubList: [],
+      invQueryData: {},
 
 
-        };
+    };
+  },
+  components: {
+    draggable,
+    purPlanProducts,
+  },
+  methods: {
+    saveOrder(status) {
+      let tip = "";
+      if (status == "3") {
+        tip = "是否确定通过该采购计划？";
+      } else {
+        tip = "是否确定拒绝该采购计划？";
+      }
+      this.$confirm(tip, "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.submitFunction(status);
+      }).catch(() => {
+        this.loading = false;
+      });
+    },
+    submitFunction(status) {
+      let tMessage = status === '1' ? '保存' : '提交';
+      this.loading = true;
+      let tQuery = {
+        autoPurchase: this.formData.autoPurchase,
+        targetSubInv: this.formData.targetSubInv,
+        targetDeptCode: this.formData.targetDeptCode,
+        targetBillAction: this.formData.targetBillAction,
+        editStatus: status,
+        purOrderEntity: this.formData,
+        subErpOrders: this.codeArray,
+      }
+      auditOrder(tQuery)
+        .then(response => {
+          this.loading = false;
+          if (response.code === 20000) {
+            this.$message.success(tMessage + "成功");
+            this.closeDialog(true);
+          } else {
+            this.$message.error(response.message);
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        })
+    },
+    selectProductFunction() {
+      this.selectProductVisible = true;
+    },
+    closeDialogC2(rData) {
+      this.selectProductVisible = false;
+      this.thisData = {};
+      if (this.$isNotBlank(rData)) {
+        this.codeArray = [];
+        rData.forEach((obj, index) => {
+          this.codeArray.unshift(obj);
+        });
+        this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
+        this.currentRow = this.codeArray[0];
+        this.selectedIndex = 0;
+      }
+    },
+    rowChange(val) {
+      this.currentRow = val;
+      this.selectedIndex = val.index;
+    },
+    tableCountChange(row) {
+      if (this.$isNotBlank(row)) {
+        // row.count = row.reCount;
+      }
     },
-    components: {
-        draggable,
-        purPlanProducts,
+    tableRowClassName({row, rowIndex}) {
+      row.index = rowIndex;
     },
-    methods: {
-        saveOrder(status) {
-            let tip = "";
-            if (status == "3") {
-                tip = "是否确定通过该采购计划？";
-            } else {
-                tip = "是否确定拒绝该采购计划？";
-            }
-            this.$confirm(tip, "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.submitFunction(status);
-            }).catch(() => {
-                this.loading = false;
-            });
-        },
-        submitFunction(status) {
-            let tMessage = status === '1' ? '保存' : '提交';
-            this.loading = true;
-            let tQuery = {
-                autoPurchase:this.formData.autoPurchase,
-                targetSubInv:this.formData.targetSubInv,
-                targetDeptCode:this.formData.targetDeptCode,
-                targetBillAction:this.formData.targetBillAction,
-                editStatus: status,
-                purOrderEntity: this.formData,
-                subErpOrders: this.codeArray,
-            }
-            auditOrder(tQuery)
-                .then(response => {
-                    this.loading = false;
-                    if (response.code === 20000) {
-                        this.$message.success(tMessage + "成功");
-                        this.closeDialog(true);
-                    } else {
-                        this.$message.error(response.message);
-                    }
-                })
-                .catch(() => {
-                    this.loading = false;
-                })
-        },
-        selectProductFunction() {
-            this.selectProductVisible = true;
-        },
-        closeDialogC2(rData) {
-            this.selectProductVisible = false;
-            this.thisData = {};
-            if (this.$isNotBlank(rData)) {
-                this.codeArray = [];
-                rData.forEach((obj, index) => {
-                    this.codeArray.unshift(obj);
-                });
-                this.$refs.multipleTable.setCurrentRow(this.codeArray[0]);
-                this.currentRow = this.codeArray[0];
-                this.selectedIndex = 0;
-            }
-        },
-        rowChange(val) {
-            this.currentRow = val;
-            this.selectedIndex = val.index;
-        },
-        tableCountChange(row) {
-            if (this.$isNotBlank(row)) {
-                // row.count = row.reCount;
-            }
-        },
-        tableRowClassName({row, rowIndex}) {
-            row.index = rowIndex;
-        },
+    // 刷新表单
+    resetForm() {
+      if (this.$refs["dataForm"]) {
+        // 清空验证信息表单
+        this.$refs["dataForm"].clearValidate();
         // 刷新表单
-        resetForm() {
-            if (this.$refs["dataForm"]) {
-                // 清空验证信息表单
-                this.$refs["dataForm"].clearValidate();
-                // 刷新表单
-                this.$refs["dataForm"].resetFields();
-                this.getList();
-            }
-        },
-        deleteCodeArray(index, row) {
-            this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
-                confirmButtonText: "确定",
-                cancelButtonText: "取消",
-                type: "warning",
-            }).then(() => {
-                this.$refs.multipleTable.setCurrentRow();
-                this.currentRow = {};
-                this.selectedIndex = "";
+        this.$refs["dataForm"].resetFields();
+        this.getList();
+      }
+    },
+    deleteCodeArray(index, row) {
+      this.$confirm("此操作将永久删除该数据, 是否继续?", "提示", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning",
+      }).then(() => {
+        this.$refs.multipleTable.setCurrentRow();
+        this.currentRow = {};
+        this.selectedIndex = "";
 
-                if (this.orderEditor) {
-                    this.detailLoading = true;
-                    if (this.$isNotBlank(row.id)) {
-                        delOrderDetail(row.id)
-                            .then(response => {
-                                this.detailLoading = false;
-                                if (response.code === 20000) {
-                                    this.$message.success(response.data);
-                                    // this.getStockOrderDetailList();
-                                    this.codeArray.splice(index, 1);
-                                } else {
-                                    this.$message.error(response.message);
-                                }
-                            })
-                            .catch(() => {
-                                this.detailLoading = false;
-                            })
-                    } else {
-                        this.$message.success('删除成功');
-                        this.codeArray.splice(index, 1);
-                    }
+        if (this.orderEditor) {
+          this.detailLoading = true;
+          if (this.$isNotBlank(row.id)) {
+            delOrderDetail(row.id)
+              .then(response => {
+                this.detailLoading = false;
+                if (response.code === 20000) {
+                  this.$message.success(response.data);
+                  // this.getStockOrderDetailList();
+                  this.codeArray.splice(index, 1);
                 } else {
-                    this.$message.success('删除成功');
-                    this.codeArray.splice(index, 1);
+                  this.$message.error(response.message);
                 }
-            }).catch(() => {
-
-            });
-        },
-        getStockOrderDetailList() {
-            this.loading = true;
-            listOrderDetail(this.query) //查找该单号下的所有条码
-                .then((response) => {
-                    console.log(response)
-                    this.codeArray = response.data.list || [];
-                    this.total = response.data.total || 0;
-                    this.loading = false;
-                })
-                .catch(() => {
-                    this.loading = false;
-                    this.list = [];
-                    this.total = 0;
-                });
-        },
-        findSubInvs() {
-            this.subInvList = [];
-            let query = {
-                pcode: this.formData.locStorageCode
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.subInvList = response.data || [];
-                    if (this.subInvList != null && this.subInvList.length == 1) {
-                        this.formData.invWarehouseCode = this.subInvList[0].code;
-                    }
-                })
-                .catch(() => {
-                });
-        },
+              })
+              .catch(() => {
+                this.detailLoading = false;
+              })
+          } else {
+            this.$message.success('删除成功');
+            this.codeArray.splice(index, 1);
+          }
+        } else {
+          this.$message.success('删除成功');
+          this.codeArray.splice(index, 1);
+        }
+      }).catch(() => {
 
-        findTargetSubInvs() {
-          if(this.formData.targetSubInv!=null && this.tarSubList.length>0){
-            this.formData.targetDeptCode= this.subInvList.find(item => item.code == this.formData.targetSubInv).parentId
+      });
+    },
+    getStockOrderDetailList() {
+      this.loading = true;
+      listOrderDetail(this.query) //查找该单号下的所有条码
+        .then((response) => {
+          console.log(response)
+          this.codeArray = response.data.list || [];
+          this.total = response.data.total || 0;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+          this.list = [];
+          this.total = 0;
+        });
+    },
+    findSubInvs() {
+      this.subInvList = [];
+      let query = {
+        pcode: this.formData.locStorageCode
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.subInvList = response.data || [];
+          if (this.subInvList != null && this.subInvList.length == 1) {
+            this.formData.invWarehouseCode = this.subInvList[0].code;
           }
-          this.tarSubList = [];
-            let query = {
-                pcode: 1000
-            };
-            filterSubByInv(query)
-                .then((response) => {
-                    this.tarSubList = response.data || [];
-                    if (this.tarSubList != null && this.tarSubList.length == 1) {
-                        this.formData.targetSubInv = this.tarSubList[0].code;
-                        this.formData.targetDeptCode=this.tarSubList[0].parentId;
+        })
+        .catch(() => {
+        });
+    },
 
-                        this.targetInvChange();
-                    }
-                })
-                .catch(() => {
-                });
-        },
-        targetInvChange() {
-            let query = {
-                code: this.formData.targetSubInv,
-                enabled: true,
-                spUse: true,
-            };
-            getLocalJoinByUser(query)
-                .then((response) => {
-                    this.busTypes = response.data.list || [];
-                    // this.formData.targetBillAction = this.busTypes[0].localAction;
-                })
-                .catch(() => {
-                });
-          let query1 = {
-            code: this.formData.targetSubInv,
-          };
-          selectByCode(query1)
-            .then((res) => {
-              if (res.code === 20000) {
-                this.formData.targetDeptCode=res.data
-              }
-            })
-        },
+    findTargetSubInvs() {
+      if (this.formData.targetSubInv != null && this.tarSubList.length > 0) {
+        this.formData.targetDeptCode = this.subInvList.find(item => item.code == this.formData.targetSubInv).parentId
+      }
+      this.tarSubList = [];
+      let query = {
+        pcode: 1000
+      };
+      filterSubByInv(query)
+        .then((response) => {
+          this.tarSubList = response.data || [];
+          if (this.tarSubList != null && this.tarSubList.length == 1) {
+            this.formData.targetSubInv = this.tarSubList[0].code;
+            this.formData.targetDeptCode = this.tarSubList[0].parentId;
 
+            this.targetInvChange();
+          }
+        })
+        .catch(() => {
+        });
     },
-    filters: {},
-    mounted() {
-        document.body.ondrop = function (event) {
-            event.preventDefault();
-            event.stopPropagation();
-        };
-    },
-    created() {
-        if (this.$isNotBlank(this.idQuery.id)) {
-            this.query.limit = 100;
-            this.query.orderIdFk = this.idQuery.id;
-            this.formData = this.idQuery.formData;
-            this.formData.targetInv = 1000;
-            this.orderEditor = true;
-            this.sValue = this.formData.corpName;
-            this.getStockOrderDetailList();
-        } else {
-            var date = new Date();
-            this.formData = {
-                id: null,
-                billNo: null,
-                remark: "",
-                deptCode: null,
-                locStorageCode: null,
-                invWarehouseCode: null,
-                auditRemark: null,
-                autoPurchase: false,
-                targetInv: 1000,
-                targetSubInv: null,
-                targetBillAction: null,
-                createTime: parseTime(
-                  date,
-                  "{y}-{m}-{d} {h}:{i}:{s}"
-                ),
-            };
-            this.orderEditor = false;
-        }
-        this.findTargetSubInvs();
-        this.codeArray = [];
+    targetInvChange() {
+      let query = {
+        code: this.formData.targetSubInv,
+        enabled: true,
+        spUse: true,
+      };
+      getLocalJoinByUser(query)
+        .then((response) => {
+          this.busTypes = response.data.list || [];
+          // this.formData.targetBillAction = this.busTypes[0].localAction;
+        })
+        .catch(() => {
+        });
+      let query1 = {
+        code: this.formData.targetSubInv,
+      };
+      selectByCode(query1)
+        .then((res) => {
+          if (res.code === 20000) {
+            this.formData.targetDeptCode = res.data
+          }
+        })
     },
+
+  },
+  filters: {},
+  mounted() {
+    document.body.ondrop = function (event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+  },
+  created() {
+    if (this.$isNotBlank(this.idQuery.id)) {
+      this.query.limit = 100;
+      this.query.orderIdFk = this.idQuery.id;
+      this.formData = this.idQuery.formData;
+      this.formData.targetInv = 1000;
+      this.orderEditor = true;
+      this.sValue = this.formData.corpName;
+      this.getStockOrderDetailList();
+    } else {
+      var date = new Date();
+      this.formData = {
+        id: null,
+        billNo: null,
+        remark: "",
+        deptCode: null,
+        locStorageCode: null,
+        invWarehouseCode: null,
+        auditRemark: null,
+        autoPurchase: false,
+        targetInv: 1000,
+        targetSubInv: null,
+        targetBillAction: null,
+        createTime: parseTime(
+          date,
+          "{y}-{m}-{d} {h}:{i}:{s}"
+        ),
+      };
+      this.orderEditor = false;
+    }
+    this.findTargetSubInvs();
+    this.codeArray = [];
+  },
 };
 </script>
 <style scoped>
 
 .ao-text {
-    width: 100%;
-    font-size: 13px;
-    font-family: "Microsoft YaHei";
-    float: right;
-    text-align: right;
-    margin-top: 10px;
+  width: 100%;
+  font-size: 13px;
+  font-family: "Microsoft YaHei";
+  float: right;
+  text-align: right;
+  margin-top: 10px;
 }
 
 </style>
diff --git a/src/views/purchase/purOrder/purOrderEditDialog.vue b/src/views/purchase/purOrder/purOrderEditDialog.vue
index ff3060a9..c8b39e77 100644
--- a/src/views/purchase/purOrder/purOrderEditDialog.vue
+++ b/src/views/purchase/purOrder/purOrderEditDialog.vue
@@ -141,6 +141,7 @@
           <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
           <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+          <el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
           <el-table-column width="150" label="采购数量">
             <template slot-scope="scope">
               <el-input size="small" v-model="scope.row.count"
@@ -169,7 +170,7 @@
     </el-form>
 
     <el-dialog
-      title="产品录入"
+      title="物资录入"
       :visible.sync="selectProductVisible"
       :close-on-click-modal="false"
       :close-on-press-escape="false"
diff --git a/src/views/purchase/purOrder/purOrderSearch.vue b/src/views/purchase/purOrder/purOrderSearch.vue
index 8a046ea7..4e98a2d1 100644
--- a/src/views/purchase/purOrder/purOrderSearch.vue
+++ b/src/views/purchase/purOrder/purOrderSearch.vue
@@ -143,6 +143,7 @@
         <el-table-column label="物资名称" prop="productName" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="规格型号" prop="spec" show-overflow-tooltip="true"></el-table-column>
         <el-table-column label="计量单位" prop="measname" show-overflow-tooltip="true" width="100"></el-table-column>
+        <el-table-column label="价格" prop="price" show-overflow-tooltip="true" width="100"></el-table-column>
         <el-table-column label="申购数量" prop="count"></el-table-column>
         <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
         <el-table-column label="生产厂家" prop="manufactory"></el-table-column>
diff --git a/src/views/purchase/purOrder/purOrderSearchDetails.vue b/src/views/purchase/purOrder/purOrderSearchDetails.vue
index d0014ea2..93570b81 100644
--- a/src/views/purchase/purOrder/purOrderSearchDetails.vue
+++ b/src/views/purchase/purOrder/purOrderSearchDetails.vue
@@ -75,16 +75,18 @@
 
       <el-table v-loading="loading" :data="list" style="width: 100%" border highlight-current-row>
         <el-table-column label="序号" type="index" width="60"></el-table-column>
-        <el-table-column label="采购单号" prop="billNo"></el-table-column>
-        <el-table-column label="DI/物资编码" prop="productId"></el-table-column>
-        <el-table-column label="物资名称" prop="productName"></el-table-column>
-        <el-table-column label="规格型号" prop="spec"></el-table-column>
-        <el-table-column label="采购数量" prop="count"></el-table-column>
-        <el-table-column label="计量单位" prop="measname"></el-table-column>
-        <el-table-column label="供应商" prop="supName"></el-table-column>
-        <el-table-column label="生产企业" prop="manufactory"></el-table-column>
-        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh"></el-table-column>
-        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc"></el-table-column>
+        <el-table-column label="采购单号" prop="billNo" width="140" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="DI/物资编码" prop="productId" width="140" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="物资名称" prop="productName" width="140" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="规格型号" prop="spec" width="160" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="采购数量" prop="count" width="100" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" width="100" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="价格" prop="price" width="100"
+                         show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="供应商" prop="supName" width="160" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" width="160" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案号" prop="zczbhhzbapzbh" width="160" show-overflow-tooltip="true"></el-table-column>
+        <el-table-column label="注册/备案人" prop="ylqxzcrbarmc" width="160" show-overflow-tooltip="true"></el-table-column>
       </el-table>
 
       <pagination
diff --git a/src/views/purchase/purOrder/purOrderSelectProduct.vue b/src/views/purchase/purOrder/purOrderSelectProduct.vue
index f73b0c90..91fd3bf5 100644
--- a/src/views/purchase/purOrder/purOrderSelectProduct.vue
+++ b/src/views/purchase/purOrder/purOrderSelectProduct.vue
@@ -3,45 +3,57 @@
     <el-card class="el-card">
       <el-form :model="listQuery" label-width="120px" v-show="showSearch">
         <el-row>
-          <el-col :span="12">
+          <el-col :span="18">
             <el-form-item label="UDI码:" class="query-form-item">
               <el-input v-model="listQuery.udiCode" style="width: 96%" placeholder="请扫描或输入UDI码" clearable="true"
                         @keyup.enter.native="keyup_submit($event)"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="第三方物资编码:" class="query-form-item">
-              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"
-                        clearable="true"></el-input>
-            </el-form-item>
-          </el-col>
+          <!--          <el-col :span="6">-->
+          <!--            <el-form-item label="第三方物资编码:" class="query-form-item">-->
+          <!--              <el-input v-model="listQuery.thrPiId" style="width: 90%" placeholder="请输入第三方物资编码"-->
+          <!--                        clearable="true"></el-input>-->
+          <!--            </el-form-item>-->
+          <!--          </el-col>-->
         </el-row>
 
         <el-row>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="物品编码:" class="query-form-item">
               <el-input v-model="listQuery.unionCode" style="width: 90%" placeholder="请输入DI/医保编码/商品条码"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="产品通用名:" class="query-form-item">
               <el-input v-model="listQuery.cpmctymc" style="width: 90%" placeholder="请输入产品通用名"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="8">
             <el-form-item label="规格型号:" class="query-form-item">
               <el-input v-model="listQuery.ggxh" style="width: 90%" placeholder="请输入规格型号" clearable="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
+        </el-row>
+
+        <el-row>
+
+          <el-col :span="8">
             <el-form-item label="生产企业:" class="query-form-item">
-              <el-input v-model="listQuery.ylqxzcrbarmc" style="width: 90%" placeholder="请输入生产企业/注册备案人"
+              <el-input v-model="listQuery.manufactory" style="width: 90%" placeholder="请输入生产企业"
+                        clearable="true"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="8">
+            <el-form-item label="注册/备案证号:" class="query-form-item">
+              <el-input v-model="listQuery.zczbhhzbapzbh" style="width: 90%" placeholder="注册/备案证号"
                         clearable="true"></el-input>
             </el-form-item>
           </el-col>
         </el-row>
+
       </el-form>
 
       <div class="top-right-btn">
@@ -62,15 +74,15 @@
           </template>
         </el-table-column>
         <el-table-column label="序号" type="index"></el-table-column>
-        <el-table-column label="最小销售产品标识" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
-        <el-table-column label="物资编码" prop="thirdId" show-overflow-tooltip></el-table-column>
-        <el-table-column label="医疗器械注册人" prop="ylqxzcrbarmc"></el-table-column>
-        <el-table-column label="产品通用名" prop="cpmctymc" show-overflow-tooltip></el-table-column>
-        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip></el-table-column>
-        <el-table-column label="器械类别" prop="qxlb" show-overflow-tooltip></el-table-column>
-        <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="操作" width="160">
+        <el-table-column label="DI/物资编码" prop="nameCode" width="140" show-overflow-tooltip></el-table-column>
+        <el-table-column label="物资名称" prop="cpmctymc" show-overflow-tooltip width="140"></el-table-column>
+        <el-table-column label="规格型号" prop="ggxh" show-overflow-tooltip width="140"></el-table-column>
+        <el-table-column label="计量单位" prop="measname" show-overflow-tooltip width="100"></el-table-column>
+        <el-table-column label="价格" prop="price" width="100"></el-table-column>
+        <el-table-column label="生产企业" prop="manufactory" show-overflow-tooltip width="160"></el-table-column>
+        <el-table-column label="注册/备案凭证" prop="zczbhhzbapzbh" show-overflow-tooltip width="160"></el-table-column>
+        <el-table-column label="配送企业" prop="companyName" show-overflow-tooltip width="160"></el-table-column>
+        <el-table-column label="操作" width="90" fixed="right">
           <template slot-scope="scope">
             <el-button type="text" size="small" @click.native.stop="handleDetailClick(scope.row)">详情</el-button>
           </template>
@@ -161,6 +173,8 @@ export default {
         thrPiId: null,
         page: 1,
         limit: 10,
+        zczbhhzbapzbh: null,
+        manufactory: null,
       },
       combineQuery: {
         thirdId: "",
@@ -336,7 +350,8 @@ export default {
         count: 1,
         orderIdFk: this.pId,
         supId: this.multipleSelection.customerId,
-        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh
+        zczbhhzbapzbh: this.multipleSelection.zczbhhzbapzbh,
+        price:this.multipleSelection.price
       };
       addOrderDetail(tQuery).then((response) => {
         this.loading = false;
@@ -379,6 +394,8 @@ export default {
       }
     }
 
+    this.getList();
+
   },
 };
 </script>