diff --git a/src/api/inout/orderDetailResult.js b/src/api/inout/orderDetailResult.js
index f7b60a8..d0b2931 100644
--- a/src/api/inout/orderDetailResult.js
+++ b/src/api/inout/orderDetailResult.js
@@ -10,7 +10,8 @@ export function getResultDetailList(params) {
 
 export function getResultOrderList(params) {
   return axios({
-    url: "/udiwms/inout/resultDetail/filterOrderList",
+    // url: "/udiwms/inout/resultDetail/filterOrderList",
+    url: "/udiwms/inout/stat/filter",
     method: "get",
     params: params
   });
diff --git a/src/views/basic/product/productEdit.vue b/src/views/basic/product/productEdit.vue
index 57501a5..14c7aa5 100644
--- a/src/views/basic/product/productEdit.vue
+++ b/src/views/basic/product/productEdit.vue
@@ -369,6 +369,16 @@
 
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="包装规格:">
+              <el-input
+                style="width: 80%"
+                size="small"
+                splaceholder="请输入内容"
+                v-model="editQuery.bzgg"
+              ></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
 
 
diff --git a/src/views/supplier/products/selectDIDetailDialog.vue b/src/views/supplier/products/selectDIDetailDialog.vue
index 6dba94d..ff6012e 100644
--- a/src/views/supplier/products/selectDIDetailDialog.vue
+++ b/src/views/supplier/products/selectDIDetailDialog.vue
@@ -63,7 +63,7 @@
           <el-col :span="12">
             <el-form-item label="商品名称:">
               <el-input style="width: 65%" size="small" :disabled="true" splaceholder="请输入内容"
-                        v-model="editQuery.cpmctymc"></el-input>
+                        v-model="editQuery.spmc"></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
diff --git a/src/views/sync/SysUdimsConfig.vue b/src/views/sync/SysUdimsConfig.vue
index 8407589..48069be 100644
--- a/src/views/sync/SysUdimsConfig.vue
+++ b/src/views/sync/SysUdimsConfig.vue
@@ -387,6 +387,53 @@
           >医疗器械注册人</el-checkbox
         > -->
           </el-descriptions-item>
+          <!-- 设备管理数据 -->
+          <el-descriptions-item>
+            <template slot="label">设备管理数据</template>
+            <el-form label-positiom="right" label-width="200px" :inline="true" disabled style="padding-top: 20px">
+              <el-form-item label="基础设备数据">
+                <el-select v-model="configQuery.deviceInfo">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="巡检设备管理">
+                <el-select v-model="configQuery.deviceCheck">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="报修设备管理">
+                <el-select v-model="configQuery.deviceRepairApply">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="保养设备管理">
+                <el-select v-model="configQuery.deviceUpkeep">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-descriptions-item>
+          <!-- 生产企业数据 -->
+          <el-descriptions-item>
+            <template slot="label"> 生产企业数据</template>
+            <el-form label-positiom="right" label-width="200px" :inline="true" disabled style="padding-top: 20px">
+              <el-form-item label="生产企业信息">
+                <el-select v-model="configQuery.produceBusiness">
+                  <el-option :value="0" label="不同步"></el-option>
+                  <el-option :value="1" label="由内向外"></el-option>
+                  <el-option :value="2" label="由外向内"></el-option>
+                </el-select>
+              </el-form-item>
+            </el-form>
+          </el-descriptions-item>
         </el-descriptions>
       </el-collapse-item>
 
@@ -871,6 +918,11 @@ export default {
         udiCodeLost: null,
         udiCodeRel: null,
         orderInvoice: null,
+        deviceInfo:null,//设备基础数据
+        deviceCheck:null,//设备巡检
+        deviceRepairApply:null,//设备报修
+        deviceUpkeep:null,//设备保养
+        produceBusiness:null,//生产企业数据
       },
       checkedBusTypes: [],
       checkedToInBusTypes: [],
diff --git a/src/views/thirdSys/product/thrProductsEdit.vue b/src/views/thirdSys/product/thrProductsEdit.vue
index fa68394..2ce268d 100644
--- a/src/views/thirdSys/product/thrProductsEdit.vue
+++ b/src/views/thirdSys/product/thrProductsEdit.vue
@@ -114,6 +114,14 @@
         </el-form-item>
       </el-col>
     </el-row>
+    <el-row type="flex">
+      <el-col :span="11" class="el-col">
+        <el-form-item label="包装规格:" prop="bzgg">
+          <el-input style="width: 90%" size="small" placeholder="请输入包装规格"
+                    v-model.trim="newProductData.bzgg"></el-input>
+        </el-form-item>
+      </el-col>
+    </el-row>
 
     <el-row type="flex">
       <el-col :span="23" class="el-col">
@@ -212,6 +220,7 @@ export default {
     },
   },
   created() {
+    console.log("dangqian de shixn ",this.newProductData)
     this.getBasicThirdSys();
   },
 }