From 34663a8aae15a776dbf72c9a39976a4863bdc8b1 Mon Sep 17 00:00:00 2001
From: anthonywj <yewenjie20@vip.qq.com>
Date: Mon, 26 Feb 2024 15:47:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B,=E8=80=97=E6=9D=90=E5=AD=97=E5=85=B8bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |  10 +-
 .../basic/busType/bussinessTypeModify.vue     |  15 +-
 src/views/basic/product/product.vue           |   1 +
 src/views/basic/product/productEdit.vue       |  29 +-
 src/views/inout/IoCreateOrder.vue             | 355 +++++++++---------
 .../company/basicCompanyproductEdit.vue       |  29 +-
 .../products/selectDIDetailDialog.vue         |  71 ++--
 .../products/supAddDiProductSelectUdi.vue     |  30 +-
 src/views/system/param/busTypePre.vue         |   1 +
 9 files changed, 287 insertions(+), 254 deletions(-)

diff --git a/.env.production b/.env.production
index 05d414c..acb070c 100644
--- a/.env.production
+++ b/.env.production
@@ -37,15 +37,15 @@ ENV = 'production'
 
 # VUE_APP_BASE_API = 'http://dm.xmglxp.com:8081/UDI_SPMS_SERVER/'
 
-# VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
+VUE_APP_BASE_API = 'http://dm.xmglxp.com:81/UDI_SPMS_SERVER/'
 
 #诏安医院
 # VUE_APP_BASE_API = 'http://139.9.174.242:9150/UDI_SPMS_SERVER/'
 # VUE_APP_BASE_API = 'http://192.168.0.17:9150/UDI_SPMS_SERVER/'
 # 大田
 # VUE_APP_BASE_API = 'http://110.83.220.178:9150/UDI_SPMS_SERVER/'
-# 云霄妇幼
-# VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/'
+# VUE_APP_BASE_API = 'http://122.112.160.36:9160/UDI_SPMS_SERVER/
+# 云霄妇幼'
 # VUE_APP_BASE_API = 'http://192.168.0.72:9150/UDI_SPMS_SERVER/'
 
 # 南靖
@@ -58,10 +58,10 @@ VUE_APP_BASE_API = 'http://116.204.108.228:9150/UDI_SPMS_SERVER/'
 # 应用访问路径 例如使用前缀 /admin/
 
 # 域名
-VUE_APP_CONTEXT_PATH = '/'
+# VUE_APP_CONTEXT_PATH = '/'
 
 # 其他
-# VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
+VUE_APP_CONTEXT_PATH = '/UDI_SPMS_CLIENT/'
 
 # 监控地址
 VUE_APP_MONITRO_ADMIN = '/admin/login'
diff --git a/src/views/basic/busType/bussinessTypeModify.vue b/src/views/basic/busType/bussinessTypeModify.vue
index 47d9e42..cc077d7 100644
--- a/src/views/basic/busType/bussinessTypeModify.vue
+++ b/src/views/basic/busType/bussinessTypeModify.vue
@@ -360,7 +360,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.scanPreIn" style="width: 65%"
-                         :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.advancePreIn==1 || inputQuery.vailInv==1"
+                         :disabled="inputQuery.useDyCount!=2 &&(  inputQuery.advancePreIn==1 || inputQuery.vailInv==1)"
                          placeholder="是否启用">
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
@@ -380,7 +380,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.advancePreIn" style="width: 65%"
-                         :disabled=" inputQuery.mainAction == 'WareHouseIn' || inputQuery.corpType !== 1 || inputQuery.scanPreIn==1 || inputQuery.vailInv==1"
+                         :disabled="inputQuery.useDyCount!=2 &&(  inputQuery.scanPreIn==1 || inputQuery.vailInv==1)"
                          placeholder="是否启用">
                 <el-option label="是" :value="true"></el-option>
                 <el-option label="否" :value="false"></el-option>
@@ -400,7 +400,7 @@
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
               <el-select v-model="inputQuery.vailInv" style="width: 65%"
-                         :disabled=" inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1"
+                         :disabled="inputQuery.useDyCount!=2 &&( inputQuery.mainAction!= 'WareHouseOut' || inputQuery.advancePreIn==1 || inputQuery.scanPreIn==1)"
                          placeholder="是否启用"
               >
                 <el-option label="是" :value="true"></el-option>
@@ -416,7 +416,7 @@
 
           <el-row>
             <el-col span="5">
-              <span class="sptext">允许科室多次使用出库</span>
+              <span class="sptext">物资使用出库模式</span>
             </el-col>
             <el-divider direction="vertical"></el-divider>
             <el-col span="5">
@@ -424,8 +424,9 @@
                          :disabled=" inputQuery.mainAction!= 'WareHouseOut'  || inputQuery.corpType != 1"
                          placeholder="是否启用"
               >
-                <el-option label="是" :value="true"></el-option>
-                <el-option label="否" :value="false"></el-option>
+                <el-option label="正常" :value="0"></el-option>
+                <el-option label="物资多次使用出库" :value="1"></el-option>
+                <el-option label="科室集合出库" :value="2"></el-option>
               </el-select>
             </el-col>
             <el-divider direction="vertical"></el-divider>
@@ -1300,7 +1301,7 @@ export default {
 
       if (this.inputQuery.corpType !== 1) {
         this.inputQuery.genUnit = false
-        this.inputQuery.useDyCount = false
+        this.inputQuery.useDyCount = 0
       } else {
         this.inputQuery.genUnit = this.oldData.genUnit
         this.inputQuery.useDyCount = this.oldData.useDyCount
diff --git a/src/views/basic/product/product.vue b/src/views/basic/product/product.vue
index cc5e9a5..46e8d5f 100644
--- a/src/views/basic/product/product.vue
+++ b/src/views/basic/product/product.vue
@@ -2157,6 +2157,7 @@ export default {
     },
 
     handleModifyClick(_this,row) {
+      debugger
       _this.uuid = row.uuid;
       _this.relId = row.id;
       _this.isImport = false;
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index bac1f44..d43bf29 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -331,20 +331,39 @@
               </el-col>
             </el-row>
             <el-divider></el-divider>
+            <!--            <el-row>-->
+            <!--              <el-col span="5">-->
+            <!--                <span class="sptext">是否寄售</span>-->
+            <!--              </el-col>-->
+            <!--              <el-divider direction="vertical"></el-divider>-->
+            <!--              <el-col span="5">-->
+            <!--                <el-select v-model="editQuery.isAdavence" style="width: 65%" placeholder="状态" clearable>-->
+            <!--                  <el-option label="是" :value="true"></el-option>-->
+            <!--                  <el-option label="否" :value="false"></el-option>-->
+            <!--                </el-select>-->
+            <!--              </el-col>-->
+            <!--              <el-divider direction="vertical"></el-divider>-->
+            <!--              <el-col span="13">-->
+            <!--                <span class="sptext">是否寄售</span>-->
+            <!--              </el-col>-->
+            <!--            </el-row>-->
+            <!--            <el-divider></el-divider>-->
+
             <el-row>
               <el-col span="5">
-                <span class="sptext">是否寄售</span>
+                <span class="sptext">采购类型</span>
               </el-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="5">
-                <el-select v-model="editQuery.isAdavence" style="width: 65%" placeholder="状态" clearable>
-                  <el-option label="是" :value="true"></el-option>
-                  <el-option label="否" :value="false"></el-option>
+                <el-select v-model="editQuery.purType" style="width: 65%" placeholder="选择采购类型" 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-col>
               <el-divider direction="vertical"></el-divider>
               <el-col span="13">
-                <span class="sptext">是否寄售</span>
+                <span class="sptext">采购类型</span>
               </el-col>
             </el-row>
             <el-divider></el-divider>
diff --git a/src/views/inout/IoCreateOrder.vue b/src/views/inout/IoCreateOrder.vue
index 46f9796..e891e67 100644
--- a/src/views/inout/IoCreateOrder.vue
+++ b/src/views/inout/IoCreateOrder.vue
@@ -1,88 +1,90 @@
 <template>
   <div>
     <el-card class="el-card">
-      <el-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini" label-width="100px" v-show="showSearch">
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单号:">-->
-<!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
-<!--                        style="width: 90%"-->
-<!--                        clearable="true"></el-input>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
-<!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
-<!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购部门:">&ndash;&gt;-->
-<!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"&ndash;&gt;-->
-<!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
-<!--          &lt;!&ndash;              >&ndash;&gt;-->
-<!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
-<!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
-<!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
-<!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
-<!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
-<!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
-<!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
-<!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="收货仓库:">-->
-<!--              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"-->
-<!--                         style="width: 90%"-->
-<!--                         @change="invChange"-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item in invList"-->
-<!--                  :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-row>-->
-<!--        <el-row>-->
-<!--          <el-col :span="8">-->
-<!--            <el-form-item class="query-form-item" label="单据类型:">-->
-<!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
-<!--                         style="width: 90%"-->
-<!--                         clearable>-->
-<!--                <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-form v-if="queryList && queryList.length > 0" :model="filterQuery" class="query-form" size="mini"
+               label-width="100px" v-show="showSearch">
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="单号:">-->
+        <!--              <el-input v-model="filterQuery.billNo" placeholder="单号"-->
+        <!--                        style="width: 90%"-->
+        <!--                        clearable="true"></el-input>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
+        <!--          &lt;!&ndash;          <el-col :span="8">&ndash;&gt;-->
+        <!--          &lt;!&ndash;            <el-form-item class="query-form-item" label="采购部门:">&ndash;&gt;-->
+        <!--          &lt;!&ndash;              <el-select v-model="filterQuery.deptCode" placeholder="请选择采购部门" clearable="true"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                         style="width: 90%"&ndash;&gt;-->
+        <!--          &lt;!&ndash;              >&ndash;&gt;-->
+        <!--          &lt;!&ndash;                <el-option&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  v-for="item in deptList"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :key="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :label="item.name"&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  :value="item.code">&ndash;&gt;-->
+        <!--          &lt;!&ndash;                  <span style="float: left">{{ item.name }}</span>&ndash;&gt;-->
+        <!--          &lt;!&ndash;                </el-option>&ndash;&gt;-->
+        <!--          &lt;!&ndash;              </el-select>&ndash;&gt;-->
+        <!--          &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+        <!--          &lt;!&ndash;          </el-col>&ndash;&gt;-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="收货仓库:">-->
+        <!--              <el-select v-model="filterQuery.invCode" placeholder="请选择收货仓库" clearable="true"-->
+        <!--                         style="width: 90%"-->
+        <!--                         @change="invChange"-->
+        <!--              >-->
+        <!--                <el-option-->
+        <!--                  v-for="item in invList"-->
+        <!--                  :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-row>-->
+        <!--        <el-row>-->
+        <!--          <el-col :span="8">-->
+        <!--            <el-form-item class="query-form-item" label="单据类型:">-->
+        <!--              <el-select v-model="filterQuery.action" placeholder="请选择单据类型"-->
+        <!--                         style="width: 90%"-->
+        <!--                         clearable>-->
+        <!--                <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-col :span="8">-->
+        <!--          <el-col :span="8">-->
 
 
-<!--            <el-form-item class="query-form-item" label="创建时间:">-->
-<!--              <el-date-picker-->
-<!--                :picker-options="pickerOptions"-->
-<!--                v-model="actDateRange"-->
-<!--                type="daterange"-->
-<!--                format="yyyy 年 MM 月 dd 日"-->
-<!--                value-format="yyyy-MM-dd"-->
-<!--                range-separator="至"-->
-<!--                start-placeholder="开始日期"-->
-<!--                end-placeholder="结束日期"-->
-<!--                style="width: 90%"-->
-<!--              >-->
-<!--              </el-date-picker>-->
-<!--            </el-form-item>-->
-<!--          </el-col>-->
+        <!--            <el-form-item class="query-form-item" label="创建时间:">-->
+        <!--              <el-date-picker-->
+        <!--                :picker-options="pickerOptions"-->
+        <!--                v-model="actDateRange"-->
+        <!--                type="daterange"-->
+        <!--                format="yyyy 年 MM 月 dd 日"-->
+        <!--                value-format="yyyy-MM-dd"-->
+        <!--                range-separator="至"-->
+        <!--                start-placeholder="开始日期"-->
+        <!--                end-placeholder="结束日期"-->
+        <!--                style="width: 90%"-->
+        <!--              >-->
+        <!--              </el-date-picker>-->
+        <!--            </el-form-item>-->
+        <!--          </el-col>-->
 
 
-<!--        </el-row>-->
+        <!--        </el-row>-->
         <el-row style=" display:flex;  flex-wrap: wrap; ">
-          <template v-for="(item, index) in queryList" >
-            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`" :key="item.id">
+          <template v-for="(item, index) in queryList">
+            <el-form-item v-if="item.columnType == 'input' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`" :key="item.id">
               <el-input
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -91,7 +93,8 @@
                 clearable
               ></el-input>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'select' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select v-model="filterQuery[item.columnName]"
                          :placeholder="item.columnDesc"
                          :disabled="executeEval(null,item.disabledFuc,false)"
@@ -104,7 +107,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'selectServer' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-select
                 v-model="filterQuery[item.columnName]"
                 :placeholder="item.columnDesc"
@@ -122,7 +126,8 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'datePicker' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 :picker-options="pickerOptions"
                 v-model="actDateRange"
@@ -134,7 +139,8 @@
                 end-placeholder="结束日期"
               ></el-date-picker>
             </el-form-item>
-            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)" :label="item.columnDesc+`:`">
+            <el-form-item v-if="item.columnType == 'date' && executeEval(row,item.expression,true)"
+                          :label="item.columnDesc+`:`">
               <el-date-picker
                 v-model="filterQuery[item.columnName]"
                 :style="`width:${item.width+'px'}`"
@@ -160,77 +166,77 @@
           >查询
           </el-button
           >
-          <el-button type="primary" icon="el-icon-plus" @click="addOrders">新增单据</el-button>
+          <el-button type="primary" icon="el-icon-plus" @click="addOrders(null,null)">新增单据</el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>
       <el-table v-loading="loading" :data="list" style="width: 100%" highlight-current-row
-                border   :default-sort="defaultSort"
+                border :default-sort="defaultSort"
                 @sort-change="handleSortChange"
       >
-<!--        <el-table-column label="序号" type="index"></el-table-column>-->
-<!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="单据类型" prop="billTypeName" width="150">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip-->
-<!--                         sortable="custom"-->
-<!--                         :sort-orders="['ascending', 'descending']">-->
-<!--          <template slot-scope="scope">-->
-<!--            <i class="el-icon-time"></i>-->
-<!--            <span>{{ scope.row.createTime }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="序号" type="index"></el-table-column>-->
+        <!--        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip width="180"></el-table-column>-->
+        <!--        <el-table-column label="单据类型" prop="billTypeName" width="150">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="创建时间" prop="createTime" width="150" show-overflow-tooltip-->
+        <!--                         sortable="custom"-->
+        <!--                         :sort-orders="['ascending', 'descending']">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <i class="el-icon-time"></i>-->
+        <!--            <span>{{ scope.row.createTime }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
 
 
-<!--        &lt;!&ndash;        <el-table-column label="送货单位" prop="fromName" width="220">&ndash;&gt;-->
-<!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
-<!--        <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="收货仓库" prop="invName" width="120">-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
-<!--        <el-table-column label="来源" prop="fromType" width="120">-->
-<!--          <template slot-scope="scope">-->
-<!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        &lt;!&ndash;        <el-table-column label="送货单位" prop="fromName" width="220">&ndash;&gt;-->
+        <!--        &lt;!&ndash;        </el-table-column>&ndash;&gt;-->
+        <!--        <el-table-column label="采购部门" prop="deptName" width="120" v-if="enableDept">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="收货仓库" prop="invName" width="120">-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="来源单号" prop="corpOrderId" show-overflow-tooltip width="180"></el-table-column>-->
+        <!--        <el-table-column label="来源" prop="fromType" width="120">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <span>{{ fromTypeMap[scope.row.fromType] }}</span>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
 
-<!--        <el-table-column label="单据状态" prop="status" width="100">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
-<!--                checkStatus[scope.row.status]-->
-<!--              }}-->
-<!--            </el-tag>-->
-<!--          </template>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
-<!--        </el-table-column>-->
-<!--        <el-table-column label="操作" width="150" fixed="right">-->
-<!--          <template slot-scope="scope">-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="addOrders(scope.row)"-->
-<!--            >编辑-->
-<!--            </el-button-->
-<!--            >-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              @click.native.stop="deleteDialog(scope.row.billNo)"-->
-<!--            >删除-->
-<!--            </el-button-->
-<!--            >-->
-<!--            <el-button-->
-<!--              type="text"-->
-<!--              size="small"-->
-<!--              v-if="scope.row.status == 1"-->
-<!--              @click.native.stop="onUpload(scope.row.billNo)"-->
-<!--            >校验提交-->
-<!--            </el-button-->
-<!--            >-->
-<!--          </template>-->
-<!--        </el-table-column>-->
+        <!--        <el-table-column label="单据状态" prop="status" width="100">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-tag :type="statusFilterType(scope.row.status)">{{-->
+        <!--                checkStatus[scope.row.status]-->
+        <!--              }}-->
+        <!--            </el-tag>-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="备注" prop="remark" width="180" show-overflow-tooltip>-->
+        <!--        </el-table-column>-->
+        <!--        <el-table-column label="操作" width="150" fixed="right">-->
+        <!--          <template slot-scope="scope">-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native.stop="addOrders(scope.row)"-->
+        <!--            >编辑-->
+        <!--            </el-button-->
+        <!--            >-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              @click.native.stop="deleteDialog(scope.row.billNo)"-->
+        <!--            >删除-->
+        <!--            </el-button-->
+        <!--            >-->
+        <!--            <el-button-->
+        <!--              type="text"-->
+        <!--              size="small"-->
+        <!--              v-if="scope.row.status == 1"-->
+        <!--              @click.native.stop="onUpload(scope.row.billNo)"-->
+        <!--            >校验提交-->
+        <!--            </el-button-->
+        <!--            >-->
+        <!--          </template>-->
+        <!--        </el-table-column>-->
         <template v-for="(item, index) in tableHeader">
           <el-table-column
             v-if="item.columnType == 'id' && executeEval(row,item.expression,true)"
@@ -251,7 +257,7 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template  slot-scope="scope">
+            <template slot-scope="scope">
               <el-radio :label="scope.row.id" v-model="radioCheck"><span></span></el-radio>
             </template>
           </el-table-column>
@@ -264,8 +270,10 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template   slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{ item.lableRuleObj[scope.row[item.columnName]] }}</span>
+            <template slot-scope="scope">
+              <span :style="{color: executeFuc(scope.row,'4',item.lableRuleObj[scope.row[item.columnName]])}">{{
+                  item.lableRuleObj[scope.row[item.columnName]]
+                }}</span>
             </template>
           </el-table-column>
           <el-table-column
@@ -277,9 +285,12 @@
             :show-overflow-tooltip="item.tooltip"
             :key="item.columnName"
           >
-            <template   slot-scope="scope">
-              <el-tag :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
-                <span>{{ item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName] }}</span>
+            <template slot-scope="scope">
+              <el-tag
+                :type="executeFuc(scope.row,'4',item,item.lableRuleObj?item.lableRuleObj[scope.row[item.columnName]]:scope.row[item.columnName])">
+                <span>{{
+                    item.lableRuleObj ? item.lableRuleObj[scope.row[item.columnName]] : scope.row[item.columnName]
+                  }}</span>
               </el-tag>
             </template>
           </el-table-column>
@@ -314,7 +325,9 @@
             :key="item.columnName"
           >
             <template slot-scope="scope">
-              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{ scope.row[item.columnName] }}</span>
+              <span :style="{color: executeFuc(scope.row,'4',item,scope.row[item.columnName])}">{{
+                  scope.row[item.columnName]
+                }}</span>
             </template>
           </el-table-column>
         </template>
@@ -376,7 +389,7 @@ import {getLocalJoinByUserOptimize} from "@/api/basic/busType";
 import {selectSysParamByKey} from "@/api/param/systemParamConfig";
 import {getDeptListByUser} from "@/api/auth/authDept";
 import {
-  getHead,executeFuc
+  getHead, executeFuc
 } from "@/utils/customConfig";
 
 export default {
@@ -421,13 +434,13 @@ export default {
       codeDetailVisible: false,
       addOrderVisible: false,
       total: 0,
-      tableHeader:[],
-      queryList:[],
-      fromList:[],
+      tableHeader: [],
+      queryList: [],
+      fromList: [],
       options: {
-        getInvList:[],
-        getDeptList:[],
-        getBusType:[],
+        getInvList: [],
+        getDeptList: [],
+        getBusType: [],
       },
       loading: false,
       index: null,
@@ -451,7 +464,7 @@ export default {
         "11": "仓库盘点",
         "12": "采购计划",
         "13": "领用单据",
-        "14": "第三方系统单据","15":"采购订单"
+        "14": "第三方系统单据", "15": "采购订单"
       },
       deleteData: {
         billNo: "",
@@ -517,7 +530,7 @@ export default {
         endTime: null,
         invCode: this.$store.getters.locInvCode,
       };
-      if(invCode!=this.$store.getters.locInvCode){
+      if (invCode != this.$store.getters.locInvCode) {
         this.getBusType(this);
       }
 
@@ -564,16 +577,18 @@ export default {
         .catch(() => {
         });
     },
-    addOrders(_this,row) {
-      if(_this == null){
+    addOrders(_this, row) {
+      if (_this == null) {
         _this = this
       }
       _this.errView = 0;
       _this.idQuery = {};
-      _this.idQuery = row;
       if (row != null && row.status === 4) {
         _this.errView = 1;
+        _this.idQuery = row;
       }
+      if (row != null)
+        _this.idQuery = row;
       _this.addOrderVisible = true;
     },
     closeDialog() {
@@ -595,7 +610,7 @@ export default {
     getList() {
       this.loading = true;
       this.filterQuery.vueType = "supDelivery";
-      this.filterQuery.busType=null;
+      this.filterQuery.busType = null;
       getOrderList(this.filterQuery)
         .then((response) => {
           this.loading = false;
@@ -634,19 +649,19 @@ export default {
         .catch(() => {
         });
     },
-    deleteDialog(_this,rowId) {
+    deleteDialog(_this, row) {
       _this.$confirm("此操作将永久删除该订单, 是否继续?", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         type: "warning",
       })
         .then(() => {
-          _this.deleteOrders(rowId);
+          _this.deleteOrders(row.billNo);
         })
         .catch(() => {
         });
     },
-    onUpload(_this,data) {
+    onUpload(_this, data) {
       _this.loading = true;
       var idQuery = {
         billNo: "",
@@ -695,11 +710,11 @@ export default {
       };
       return statusMap[status];
     },
-    executeFuc(row,type,clickFuc,value){
-      return executeFuc(this,row,type,clickFuc,value);
+    executeFuc(row, type, clickFuc, value) {
+      return executeFuc(this, row, type, clickFuc, value);
     },
-    executeEval(row,expression,defaultRet){
-      if(expression){
+    executeEval(row, expression, defaultRet) {
+      if (expression) {
         return eval(expression);
       }
       return defaultRet;
@@ -714,7 +729,7 @@ export default {
   created() {
     this.getInvList(this);
     this.getBusType(this);
-    getHead("IoCreateOrder","1").then((re) => {
+    getHead("IoCreateOrder", "1").then((re) => {
       // 处理返回的数据
       this.tableObj = re.data;
       this.tableHeader = re.data.tableList;
diff --git a/src/views/supplier/company/basicCompanyproductEdit.vue b/src/views/supplier/company/basicCompanyproductEdit.vue
index b61f8ef..42bfe2c 100644
--- a/src/views/supplier/company/basicCompanyproductEdit.vue
+++ b/src/views/supplier/company/basicCompanyproductEdit.vue
@@ -71,7 +71,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row type="flex" class="edit-row">
+        <el-row>
           <el-col :span="12">
             <el-form-item label="产品价格:">
               <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.price"></el-input>
@@ -82,8 +82,20 @@
               <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.ybbm"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" class="edit-row">
+          <el-col :span="12">
+            <el-form-item label="采购类型">
+              <el-select
+                v-model="editQuery.purType"
+                placeholder="请选择"
+                clearable
+                style="width: 80%"
+              >
+                <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="12" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1+':'">
               <el-input
@@ -104,8 +116,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
             <el-form-item :label="productRemarkSet.remarkTitle3+':'">
               <el-input
@@ -126,8 +136,6 @@
               ></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
             <el-form-item :label="productRemarkSet.remarkTitle5+':'">
               <el-input
@@ -151,8 +159,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" class="edit-row">
           <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
             <el-form-item :label="productRemarkSet.remarkTitle7+':'">
               <el-select
@@ -177,7 +183,7 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="12"   v-if="productRemarkSet.remarkEnable8==true  && editQuery.basicPrductRemak6=='1'">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable8==true  && editQuery.basicPrductRemak6=='1'">
             <el-form-item :label="productRemarkSet.remarkTitle8+':'">
               <el-select
                 v-model="editQuery.basicPrductRemak8"
@@ -201,8 +207,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row type="flex" class="edit-row">
           <el-col :span="12">
             <el-form-item label="产品描述:">
               <el-input style="width: 80%" size="small" splaceholder="请输入内容" v-model="editQuery.cpms"></el-input>
@@ -326,6 +330,7 @@ export default {
         price: this.editQuery.price,
         cpms: this.editQuery.cpms,
         ybbm: this.editQuery.ybbm,
+        purType: this.editQuery.purType,
         overStockNum: this.editQuery.overStockNum,
         lowStockNum: this.editQuery.lowStockNum,
         recentDateTime: this.editQuery.recentDateTime,
diff --git a/src/views/supplier/products/selectDIDetailDialog.vue b/src/views/supplier/products/selectDIDetailDialog.vue
index 858ecb3..5da79e9 100644
--- a/src/views/supplier/products/selectDIDetailDialog.vue
+++ b/src/views/supplier/products/selectDIDetailDialog.vue
@@ -35,119 +35,111 @@
             </el-form-item>
           </el-col>
         </el-row>
-
         <el-row>
-          <el-col :span="12" class="el-col">
+          <el-col :span="12">
             <el-form-item label="商品条码:">
               <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
                         v-model="editQuery.sptm"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" class="el-col">
+          <el-col :span="12">
             <el-form-item label="医保编码:">
               <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" v-model="editQuery.ybbm"
                         @input="change($event)"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12" class="el-col">
+          <el-col :span="12">
             <el-form-item label="计量单位:">
               <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
                         v-model="editQuery.measname"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" class="el-col">
+          <el-col :span="12">
             <el-form-item label="生产企业:">
               <el-input style="width: 65%" size="small" :disabled="true" v-model="editQuery.manufactory"
                         splaceholder="请输入内容" @input="change($event)"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12" class="el-col">
+          <el-col :span="12">
             <el-form-item label="商品名称:">
               <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
                         v-model="editQuery.cpmctymc"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="12" class="el-col">
+          <el-col :span="12">
             <el-form-item label="产品描述:">
               <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
                         v-model="editQuery.cpms"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12" class="el-col">
+          <el-col :span="12">
             <el-form-item label="产品价格:">
               <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容" type="number" step="0.01"
                         v-model="editQuery.price"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-
-        <el-row>
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
+          <el-col :span="12">
+            <el-form-item label="采购类型">
+              <el-select
+                v-model="editQuery.purType"
+                placeholder="请选择"
+                clearable
+                :disabled="true"
+                style="width: 65%"
+              >
+                <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="12" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
                         v-model="editQuery.basicPrductRemak1"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable2">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable2">
             <el-form-item :label="productRemarkSet.remarkTitle2 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
                         v-model="editQuery.basicPrductRemak2"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable3">
             <el-form-item :label="productRemarkSet.remarkTitle3 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
                         v-model="editQuery.basicPrductRemak3"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable4">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable4">
             <el-form-item :label="productRemarkSet.remarkTitle4 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
                         v-model="editQuery.basicPrductRemak4"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable5">
             <el-form-item :label="productRemarkSet.remarkTitle5 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
                         v-model="editQuery.basicPrductRemak5"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable6">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable6">
             <el-form-item :label="productRemarkSet.remarkTitle6    ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
                         v-model="editQuery.basicPrductRemak6"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable7">
             <el-form-item :label="productRemarkSet.remarkTitle7 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
                         v-model="editQuery.basicPrductRemak7"></el-input>
             </el-form-item>
           </el-col>
 
-          <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable8">
+          <el-col :span="12" v-if="productRemarkSet.remarkEnable8">
             <el-form-item :label="productRemarkSet.remarkTitle8">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容" :disabled="true"
                         v-model="editQuery.basicPrductRemak8"></el-input>
@@ -585,9 +577,6 @@ export default {
   margin-bottom: 0px;
 }
 
-.el-row {
-  display: flex;
-}
 
 /* .el-col {
   border-radius: 4px;
diff --git a/src/views/supplier/products/supAddDiProductSelectUdi.vue b/src/views/supplier/products/supAddDiProductSelectUdi.vue
index 1678796..0a65601 100644
--- a/src/views/supplier/products/supAddDiProductSelectUdi.vue
+++ b/src/views/supplier/products/supAddDiProductSelectUdi.vue
@@ -197,6 +197,20 @@
                         v-model="editQuery.price"></el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="12" class="el-col">
+            <el-form-item label="采购类型">
+              <el-select
+                v-model="editQuery.purType"
+                placeholder="请选择"
+                clearable
+                style="width: 65%"
+              >
+                <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="12">
             <el-form-item
               label="是否可集采:"
@@ -209,9 +223,6 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable1">
             <el-form-item :label="productRemarkSet.remarkTitle1 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容"
@@ -225,9 +236,6 @@
                         v-model="editQuery.basicPrductRemak2"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable3">
             <el-form-item :label="productRemarkSet.remarkTitle3 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容"
@@ -241,9 +249,6 @@
                         v-model="editQuery.basicPrductRemak4"></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable5">
             <el-form-item :label="productRemarkSet.remarkTitle5 ">
               <el-input style="width: 65%" size="small" splaceholder="请输入内容"
@@ -257,16 +262,13 @@
                 v-model="editQuery.basicPrductRemak6"
                 placeholder="请选择"
                 clearable
-                style="width: 80%"
+                style="width: 65%"
               >
                 <el-option label="扣费" value="1"></el-option>
                 <el-option label="不扣费" value="0"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-
-        <el-row>
           <el-col :span="12" class="el-col" v-if="productRemarkSet.remarkEnable7">
             <el-form-item :label="productRemarkSet.remarkTitle7 ">
               <el-select
@@ -277,7 +279,7 @@
                 reserve-keyword
                 placeholder="请选择物资类别"
                 :remote-method="findThrTypeMethod"
-                style="width: 80%"
+                style="width: 65%"
               >
                 <el-option
                   v-for="item in thrTypeOptions"
diff --git a/src/views/system/param/busTypePre.vue b/src/views/system/param/busTypePre.vue
index 227b1b9..94b24cc 100644
--- a/src/views/system/param/busTypePre.vue
+++ b/src/views/system/param/busTypePre.vue
@@ -149,6 +149,7 @@ export default {
         auditStatus: null,
         busAuditStatus: null,
         createType: null,
+        splitOrder: null,
       },
       enableMap: {
         true: "全量补单",