界面修改

.env.development

@@ -6,7 +6,7 @@ ENV = 'development'
 
 # 开发环境
 # VUE_APP_BASE_API = 'https://mudi.dsxyy.org/UDI_WMS_MC/'
-VUE_APP_BASE_API = 'http://192.168.0.166:9991'
+VUE_APP_BASE_API = 'http://127.0.0.1:9991'
 VUE_APP_SYNC_API ="http://127.0.0.1:10001"
 
 # 应用访问路径 例如使用前缀 /admin/

src/views/collect/DialogReplaceCode.vue

@@ -10,7 +10,7 @@
         <el-descriptions-item label="生产日期">{{ prescribeData.productDate }}</el-descriptions-item>
         <el-descriptions-item label="失效日期">{{ prescribeData.expireDate }}</el-descriptions-item>
       </el-descriptions>
-      <el-form :model="formData" class="demo-form-inline" style="margin-top: 30px" :rules="rules"
+      <el-form :model="formData" class="demo-form-inline" style="margin-top: 30px"
                ref="formRef">
         <el-row :gutter="24">
           <el-col :span="24">
@@ -68,12 +68,6 @@ export default {
       produceDate: null,
       expireDate: null,
       saveLoading: false,
-      rules: {
-        count: [
-          {validator: this.validateCount, message: '损耗出库数量不能超出剩余数量', trigger: 'blur'}
-        ]
-      },
-
     }
   },
   methods: {

src/views/collect/IoDestroyOrder.vue

@@ -245,18 +245,11 @@
 </template>
 
 <script>
-
+import destroyOutDialog from "./destroyOutDialog.vue";
-import A from '../../plugins/KeyScaner'
-import PanelDestroyDetail from '@/views/collect/PanelDestroyDetail'
-import PanelDestroyCodeDetail from '@/views/collect/PanelDestroyCodeDetail'
-import {findInvRemind} from '@/api/inout/splitCode'
-import {enterCodeWeb, saveOrderWeb} from '@/api/inout/order'
 import {getUserBindWork} from '@/api/basic/collectPoint/userWorkplace'
-import chooseDraftOrderDialog from './chooseDraftOrderDialog'
-import dialogInvProduct from '@/views/inout/DialogSelectInvProduct'
 import {executeFuc, getHead} from '@/utils/customConfig'
 import {getSplitCode} from '@/api/collect/collectOrder'
-import {getWorkBindBusTypes, removeBusTypeById} from '@/api/basic/workPlace/sysWorkplaceDocuments'
+import {getWorkBindBusTypes} from '@/api/basic/workPlace/sysWorkplaceDocuments'
 
 export default {
   name: 'IoDestroyOrder',
@@ -327,7 +320,7 @@ export default {
       destroyType: 3,//1 产品损耗 2.根据code损耗3：拆零表损耗
     }
   },
-  components: {},
+  components: {destroyOutDialog},
   methods: {
     changePlace(_this, query) {
       _this.getWorkBindBusTypes(_this, query)

src/views/thirdSys/product/thrProductsSelect.vue

@@ -5,7 +5,8 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="物资编码:">
-              <el-input v-model="filterQuery.code" placeholder="请输入物资编码/商品条码/医保编码" style="width: 90%" @keyup.enter.native="keyupErp_submit($event)"></el-input>
+              <el-input v-model="filterQuery.code" placeholder="请输入物资编码/商品条码/医保编码" style="width: 90%"
+                        @keyup.enter.native="keyupErp_submit($event)"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
@@ -22,17 +23,29 @@
         <el-row>
           <el-col :span="6">
             <el-form-item label="注册/备案凭证:">
-            <el-input v-model="filterQuery.registerNo" clearable="true" style="width: 90%" placeholder="请输入注册/备案凭证"></el-input>
+              <el-input v-model="filterQuery.registerNo" clearable="true" style="width: 90%"
+                        placeholder="请输入注册/备案凭证"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="生产企业:">
-            <el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%" placeholder="请输入生产企业"></el-input>
+              <el-input v-model="filterQuery.manufactory" clearable="true" style="width: 90%"
+                        placeholder="请输入生产企业"></el-input>
+            </el-form-item>
+          </el-col>
+
+          <el-col :span="6">
+            <el-form-item label="产品类型:">
+              <el-select v-model="filterQuery.productType" placeholder="产品类型">
+                <el-option label="器械" value="1"></el-option>
+                <el-option label="药品" value="2"></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="6">
             <el-form-item label="外部系统:">
-            <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统" @change="thirdSysChange">
+              <el-select v-model="filterQuery.thirdSys" style="width: 90%" placeholder="请选择第三方系统"
+                         @change="thirdSysChange">
                 <el-option
                   v-for="item in thirdSys"
                   :key="item.value"
@@ -55,9 +68,11 @@
           <el-button type="primary" icon="el-icon-upload2" @click="selectExport" v-if="selectType==0">选中导出</el-button>
           <el-button type="primary" icon="el-icon-upload2" @click="allExport" v-if="selectType==0">结果全部导出</el-button>
           <el-button type="primary" icon="el-icon-top-upload" @click="uploadSmp" v-if="selectType==1">选中上传</el-button>
-          <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSmp" v-if="selectType==1">一键上传</el-button>
+          <el-button type="primary" icon="el-icon-top-upload" @click="allUploadSmp" v-if="selectType==1">一键上传
+          </el-button>
           <el-button type="primary" icon="el-icon-download" @click="downloadErp" v-if="selectType==3">选中下载</el-button>
-          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3">结果全部下载</el-button>
+          <el-button type="primary" icon="el-icon-download" @click="downloadAllErp" v-if="selectType==3">结果全部下载
+          </el-button>
         </el-button-group>
       </div>
       <el-divider style="margin: 15px"></el-divider>