diff --git a/src/router/index.js b/src/router/index.js
index 1c8803f..7ed39f3 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -55,6 +55,7 @@ import supProductAudit from "../views/purchase/supProductAudit.vue";
 import supProductSearch from "../views/purchase/supProductSearch.vue";
 import supCertAudit from "../views/purchase/supCertAudit.vue";
 import supCertSearch from "../views/purchase/supCertSearch.vue";
+import supCertSet from "../views/purchase/supCertSet.vue";
 import supCertificationAdd from "../views/purchase/supCertificationAdd.vue";
 
 import UdiInfoSmpUpload from "../views/smp/UdiInfoSmpUpload.vue";
@@ -678,6 +679,16 @@ export const asyncRouterMap = [
                 }
             },
 
+            {
+                path: "certSet",
+                component: supCertSet,
+                name: "资质上传设置",
+                icon: "",
+                meta: {
+                    authRule: ["firstCamp/certSet"]
+                }
+            },
+
 
             {
                 path: "/supplierManage",
diff --git a/src/views/basic/BusTypeChange.vue b/src/views/basic/BusTypeChange.vue
index f3d96af..de940cd 100644
--- a/src/views/basic/BusTypeChange.vue
+++ b/src/views/basic/BusTypeChange.vue
@@ -51,6 +51,7 @@
                         <el-button
                             type="text"
                             size="small"
+                            :disabled="scope.row.systemDefault"
                             @click.native.stop="handleDeleteClick(scope.row)"
                         >删除
                         </el-button
diff --git a/src/views/basic/BusTypeChangeModify.vue b/src/views/basic/BusTypeChangeModify.vue
index b44656c..4193d41 100644
--- a/src/views/basic/BusTypeChangeModify.vue
+++ b/src/views/basic/BusTypeChangeModify.vue
@@ -56,11 +56,12 @@
                     </div>
                     <el-select
                         size="small"
+                        :disabled="inputQuery.systemDefault"
                         v-model="inputQuery.type"
                         placeholder="设置类型"
                     >
                         <el-option label="耗材领用" :value="1"></el-option>
-                        <el-option label="产品申购" :value="2"></el-option>
+                        <!--                        <el-option label="产品申购" :value="2"></el-option>-->
                         <el-option label="采购计划" :value="3"></el-option>
                     </el-select>
                 </div>
@@ -74,6 +75,7 @@
                     </div>
                     <el-select
                         size="small"
+                        :disabled="inputQuery.systemDefault"
                         v-model="inputQuery.enable"
                         placeholder="启用状态"
                     >
diff --git a/src/views/business/stockOrder.vue b/src/views/business/stockOrder.vue
index a42f8a4..687599b 100644
--- a/src/views/business/stockOrder.vue
+++ b/src/views/business/stockOrder.vue
@@ -408,6 +408,7 @@ export default {
                 "1": "web端新增单据",
                 "2": "第三方系统",
                 "3": "扫码单据转换",
+                "4": "采购计划转换",
             },
             idQuery: {
                 id: "",
diff --git a/src/views/business/stockOrderDelete.vue b/src/views/business/stockOrderDelete.vue
index 9ef8667..6fbe553 100644
--- a/src/views/business/stockOrderDelete.vue
+++ b/src/views/business/stockOrderDelete.vue
@@ -260,6 +260,7 @@ export default {
                 "1": "web端新增单据",
                 "2": "第三方系统",
                 "3": "扫码单据转换",
+                "4": "采购计划转换",
             },
             fromTypeMap: {
                 "1": "UDIMS平台",
diff --git a/src/views/business/stockOrderDistribution.vue b/src/views/business/stockOrderDistribution.vue
index c6d9871..e1c3ca0 100644
--- a/src/views/business/stockOrderDistribution.vue
+++ b/src/views/business/stockOrderDistribution.vue
@@ -213,9 +213,9 @@ export default {
                 billType: [
                     {required: true, message: "请选择业务类型", trigger: "blur"}
                 ],
-                type: [
-                    {required: true, message: "请选择采购类型", trigger: "blur"}
-                ],
+                // type: [
+                //     {required: true, message: "请选择采购类型", trigger: "blur"}
+                // ],
             },
             codeArray: [],
             total: 0,
diff --git a/src/views/business/stockOrderEdit.vue b/src/views/business/stockOrderEdit.vue
index 913fdaf..fb18dd2 100644
--- a/src/views/business/stockOrderEdit.vue
+++ b/src/views/business/stockOrderEdit.vue
@@ -531,6 +531,7 @@ export default {
                 "1": "web端新增单据",
                 "2": "第三方系统",
                 "3": "扫码单据转换",
+                "4": "采购计划转换",
             },
             statusMap: {
                 "1": "草稿",
diff --git a/src/views/business/stockOrderEditDistribution.vue b/src/views/business/stockOrderEditDistribution.vue
index 4969faf..358244a 100644
--- a/src/views/business/stockOrderEditDistribution.vue
+++ b/src/views/business/stockOrderEditDistribution.vue
@@ -427,9 +427,9 @@ export default {
                 billType: [
                     {required: true, message: "请选择业务类型", trigger: "blur"}
                 ],
-                type: [
-                    {required: true, message: "请选择采购类型", trigger: "blur"}
-                ],
+                // type: [
+                //     {required: true, message: "请选择采购类型", trigger: "blur"}
+                // ],
             },
             codeArray: [],
             fromStorageOptions: [],
diff --git a/src/views/business/stockOrderEditor.vue b/src/views/business/stockOrderEditor.vue
index 4fd5264..675b817 100644
--- a/src/views/business/stockOrderEditor.vue
+++ b/src/views/business/stockOrderEditor.vue
@@ -549,6 +549,7 @@ export default {
                 "1": "web端新增单据",
                 "2": "第三方系统",
                 "3": "扫码单据转换",
+                "4": "采购计划转换",
             },
             statusMap: {
                 "1": "草稿",
diff --git a/src/views/business/stockOrderInvSearch.vue b/src/views/business/stockOrderInvSearch.vue
index 0092b01..c62018b 100644
--- a/src/views/business/stockOrderInvSearch.vue
+++ b/src/views/business/stockOrderInvSearch.vue
@@ -394,6 +394,7 @@ export default {
                 "1": "web端新增单据",
                 "2": "第三方系统",
                 "3": "扫码单据转换",
+                "4": "采购计划转换",
             },
             isSp: store.getters.customerId,
             detailFormVisible: false,
diff --git a/src/views/business/stockOrderNew.vue b/src/views/business/stockOrderNew.vue
index 7b2545b..e48d965 100644
--- a/src/views/business/stockOrderNew.vue
+++ b/src/views/business/stockOrderNew.vue
@@ -507,6 +507,7 @@ export default {
                 "1": "web端新增单据",
                 "2": "第三方系统",
                 "3": "扫码单据转换",
+                "4": "采购计划转换",
             },
             typeMap: {
                 1: "预入库",
diff --git a/src/views/business/stockOrderNewSelectProduct.vue b/src/views/business/stockOrderNewSelectProduct.vue
index c23e10d..9a28e91 100644
--- a/src/views/business/stockOrderNewSelectProduct.vue
+++ b/src/views/business/stockOrderNewSelectProduct.vue
@@ -361,6 +361,7 @@ export default {
             let ids = [];
             let data = {
                 relId: this.multipleSelection.rlId,
+                supId: this.multipleSelection.customerId
             }
             ids.push(data);
             this.loading = true;
diff --git a/src/views/business/stockOrderSearch.vue b/src/views/business/stockOrderSearch.vue
index 5b708c2..db758c8 100644
--- a/src/views/business/stockOrderSearch.vue
+++ b/src/views/business/stockOrderSearch.vue
@@ -547,6 +547,7 @@ export default {
                 "1": "web端新增单据",
                 "2": "第三方系统",
                 "3": "扫码单据转换",
+                "4": "采购计划转换",
             },
             isSp: store.getters.customerId,
             detailFormVisible: false,
diff --git a/src/views/business/stockOrderUpload.vue b/src/views/business/stockOrderUpload.vue
index 7c62d82..f7706b7 100644
--- a/src/views/business/stockOrderUpload.vue
+++ b/src/views/business/stockOrderUpload.vue
@@ -1,185 +1,185 @@
 <template>
-  <div>
-    <el-card class="el-card">
-      <el-form
-          :inline="true"
-          :model="query"
-          class="query-form"
-          size="mini"
-
-      >
-        <el-row style="width: 100%">
-          <el-form-item class="query-form-item">
-            <el-input v-model="query.billNo" placeholder="单据号"></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
-              <el-option
-                  v-for="item in busTypes"
-                  :key="item.localName"
-                  :label="item.localName"
-                  :value="item.localAction">
-                <span style="float: left">{{ item.localName }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item class="query-form-item">
-            <el-select v-model="query.orderStatus" placeholder="请选择单据状态" clearable="true" size="mini">
-              <el-option
-                  v-for="item in orderStatusList"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value">
-                <span style="float: left">{{ item.label }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item class="query-form-item">
-            <el-select v-model="query.submitStatus" placeholder="请选择提交状态" clearable="true" size="mini">
-              <el-option
-                  v-for="item in submitStatusList"
-                  :key="item.label"
-                  :label="item.label"
-                  :value="item.value">
-                <span style="float: left">{{ item.label }}</span>
-              </el-option>
-            </el-select>
-          </el-form-item>
-
-          <el-form-item class="query-form-item">
-            <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
-          </el-form-item>
-          <el-form-item class="query-form-item">
-            <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
-            <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="结束日期"
+    <div>
+        <el-card class="el-card">
+            <el-form
+                :inline="true"
+                :model="query"
+                class="query-form"
+                size="mini"
+
+            >
+                <el-row style="width: 100%">
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.billNo" placeholder="单据号"></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.billType" placeholder="请选择业务类型" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in busTypes"
+                                :key="item.localName"
+                                :label="item.localName"
+                                :value="item.localAction">
+                                <span style="float: left">{{ item.localName }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.orderStatus" placeholder="请选择单据状态" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in orderStatusList"
+                                :key="item.label"
+                                :label="item.label"
+                                :value="item.value">
+                                <span style="float: left">{{ item.label }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-select v-model="query.submitStatus" placeholder="请选择提交状态" clearable="true" size="mini">
+                            <el-option
+                                v-for="item in submitStatusList"
+                                :key="item.label"
+                                :label="item.label"
+                                :value="item.value">
+                                <span style="float: left">{{ item.label }}</span>
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+
+                    <el-form-item class="query-form-item">
+                        <el-input v-model="query.corpName" placeholder="往来单位" clearable></el-input>
+                    </el-form-item>
+                    <el-form-item class="query-form-item">
+                        <span style="color: #000; margin-left: 10px; margin-right: 6px">单据日期:</span>
+                        <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="结束日期"
+                        >
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item>
+                        <el-button-group>
+                            <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
+                            <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
+                        </el-button-group>
+                    </el-form-item>
+
+                </el-row>
+            </el-form>
+            <el-table v-loading="loading"
+                      :data="list"
+                      style="width: 100%; " highlight-current-row
+                      @row-click="getStockOrderDetailList" ref="multipleTable">
+                <el-table-column type="index" label="序号" width="50"></el-table-column>
+                <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
+                <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
+                <el-table-column label="单据来源" prop="sourceType" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ sourceMap[scope.row.sourceType] }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="单据日期" prop="billdate"></el-table-column>
+                <!--                <el-table-column label="单据状态">-->
+                <!--                    <template slot-scope="scope">-->
+                <!--                        {{ scope.row.status | statusFilterName }}-->
+                <!--                    </template>-->
+                <!--                </el-table-column>-->
+
+
+                <el-table-column label="业务类型" prop="billType">
+                    <template slot-scope="scope">
+                        <span>{{ getActionName(scope.row.billType) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前仓库" prop="locStorageCode" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="当前分库" prop="invWarehouseCode" width="150">
+                    <template slot-scope="scope">
+                        <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column label="提交状态">
+
+
+                    <template slot-scope="scope">
+
+                        <el-tag :type="(scope.row.exportStatus) | statusFilterType">
+                            {{ exportStatusMap[scope.row.exportStatus] }}
+                        </el-tag>
+
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="200">
+                    <template slot-scope="scope">
+                        <el-button
+                            v-if="scope.row.submitFlag"
+                            type="text"
+                            size="small"
+                            @click.native="submitOrder(scope.row)">
+                            提交
+                        </el-button>
+
+                    </template>
+                </el-table-column>
+            </el-table>
+
+            <el-pagination
+                :page-size="query.limit"
+                @current-change="handleCurrentChange"
+                layout="prev, pager, next"
+                :total="total"
+            >
+            </el-pagination>
+        </el-card>
+
+        <el-card class="el-card">
+            <el-table v-loading="detailLoading"
+                      :data="detailList"
+                      @selection-change="changeFun"
+                      style="width: 100%">
+                <el-table-column label="产品通用名" width="240" prop="productName"></el-table-column>
+                <el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
+                <el-table-column label="批次号" width="140" prop="batchNo"></el-table-column>
+                <el-table-column label="生产日期" width="100" prop="productDate"></el-table-column>
+                <el-table-column label="失效日期" width="100" prop="expireDate"></el-table-column>
+                <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
+                <el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
+                <el-table-column label="价格" width="120" prop="price"></el-table-column>
+                <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo"></el-table-column>
+                <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo"></el-table-column>
+                <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo"></el-table-column>
+                <el-table-column label="发票日期" width="150" prop="invoiceDate"></el-table-column>
+            </el-table>
+
+            <el-pagination
+                :page-size="detailQuery.limit"
+                @current-change="detailHandleCurrentChange"
+                layout="prev, pager, next"
+                :total="detailTotal"
             >
-            </el-date-picker>
-          </el-form-item>
-          <el-form-item>
-            <el-button-group>
-              <el-button type="primary" icon="el-icon-refresh" @click="onReset"></el-button>
-              <el-button type="primary" icon="search" @click="onSubmit">查询</el-button>
-            </el-button-group>
-          </el-form-item>
-
-        </el-row>
-      </el-form>
-      <el-table v-loading="loading"
-                :data="list"
-                style="width: 100%; " highlight-current-row
-                @row-click="getStockOrderDetailList" ref="multipleTable">
-        <el-table-column type="index" label="序号" width="50"></el-table-column>
-        <el-table-column label="单据号" prop="billNo" show-overflow-tooltip></el-table-column>
-        <el-table-column label="往来单位" prop="corpName" show-overflow-tooltip></el-table-column>
-        <el-table-column label="单据来源" prop="sourceType" width="150">
-          <template slot-scope="scope">
-            <span>{{ sourceMap[scope.row.sourceType] }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="单据日期" prop="billdate"></el-table-column>
-        <!--                <el-table-column label="单据状态">-->
-        <!--                    <template slot-scope="scope">-->
-        <!--                        {{ scope.row.status | statusFilterName }}-->
-        <!--                    </template>-->
-        <!--                </el-table-column>-->
-
-
-        <el-table-column label="业务类型" prop="billType">
-          <template slot-scope="scope">
-            <span>{{ getActionName(scope.row.billType) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="当前仓库" prop="locStorageCode" width="150">
-          <template slot-scope="scope">
-            <span>{{ getStorageName(scope.row.locStorageCode) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="当前分库" prop="invWarehouseCode" width="150">
-          <template slot-scope="scope">
-            <span>{{ getSubStorageName(scope.row.invWarehouseCode) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="提交状态">
-
-
-          <template slot-scope="scope">
-
-            <el-tag :type="(scope.row.exportStatus) | statusFilterType">
-              {{ exportStatusMap[scope.row.exportStatus] }}
-            </el-tag>
-
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" fixed="right" width="200">
-          <template slot-scope="scope">
-            <el-button
-                v-if="scope.row.submitFlag"
-                type="text"
-                size="small"
-                @click.native="submitOrder(scope.row)">
-              提交
-            </el-button>
-
-          </template>
-        </el-table-column>
-      </el-table>
-
-      <el-pagination
-          :page-size="query.limit"
-          @current-change="handleCurrentChange"
-          layout="prev, pager, next"
-          :total="total"
-      >
-      </el-pagination>
-    </el-card>
-
-    <el-card class="el-card">
-      <el-table v-loading="detailLoading"
-                :data="detailList"
-                @selection-change="changeFun"
-                style="width: 100%">
-        <el-table-column label="产品通用名" width="240" prop="productName"></el-table-column>
-        <el-table-column label="包装规格" width="200" prop="spec"></el-table-column>
-        <el-table-column label="批次号" width="140" prop="batchNo"></el-table-column>
-        <el-table-column label="生产日期" width="100" prop="productDate"></el-table-column>
-        <el-table-column label="失效日期" width="100" prop="expireDate"></el-table-column>
-        <el-table-column label="单据数量" width="100" prop="count"></el-table-column>
-        <el-table-column label="实际数量" width="100" prop="reCount"></el-table-column>
-        <el-table-column label="价格" width="120" prop="price"></el-table-column>
-        <el-table-column label="销售清单号（第二票）" width="180" prop="secSalesListNo"></el-table-column>
-        <el-table-column label="销售发票号（第一票）" width="180" prop="firstSalesInvNo"></el-table-column>
-        <el-table-column label="销售发票号（第二票）" width="180" prop="secSalesInvNo"></el-table-column>
-        <el-table-column label="发票日期" width="150" prop="invoiceDate"></el-table-column>
-      </el-table>
-
-      <el-pagination
-          :page-size="detailQuery.limit"
-          @current-change="detailHandleCurrentChange"
-          layout="prev, pager, next"
-          :total="detailTotal"
-      >
-      </el-pagination>
-    </el-card>
-
-  </div>
+            </el-pagination>
+        </el-card>
+
+    </div>
 </template>
 
 <script>
 import {
-  stockOrderDetail,
-  deleteStockOrderById, deleteStockOrderDetailById,
-  copyStockOrderDetail, uploadStockOrderDetail,
-  updateStockOrderDetail, submitStockOrderToThirdSys
+    stockOrderDetail,
+    deleteStockOrderById, deleteStockOrderDetailById,
+    copyStockOrderDetail, uploadStockOrderDetail,
+    updateStockOrderDetail, submitStockOrderToThirdSys
 } from "../../api/inout/stockOrder";
 import {stockOrderUploadList} from "@/api/inout/stockOrderUpload";
 import {getLocalJoinByUser} from "../../api/basic/busLocalType";
@@ -187,425 +187,426 @@ import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
 export default {
-  name: "stockOrderDelSearch",
-  data() {
-    return {
-      query: {
-        billType: null,
-        corpName: null,
-        locStorageCode: null,
-        startTime: "",
-        endTime: "",
-        billNo: "",
-        orderStatus: null,
-        submitStatus: null,
-        page: 1,
-        limit: 10
-      },
-      detailQuery: {
-        orderIdFk: "",
-        page: 1,
-        limit: 20
-      },
-      busTypes: [],
-      list: [],
-      detailList: [],
-      total: 0,
-      detailTotal: 0,
-      storageList: [],
-      subInvList: [],
-      loading: false,
-      detailLoading: false,
-      idQuery: {
-        id: "",
-      },
-      exportStatusMap: {
-        null: "未提交",
-        "1": "已提交",
-        "0": "未提交",
-      },
-      distributionVisible: false,
-      detailFormRules: {
-        batchNo: [
-          {required: true, message: "请输入批次号", trigger: "blur"}
-        ],
-        productDate: [
-          {required: true, message: "请输入生产日期", trigger: "blur"}
-        ],
-        expireDate: [
-          {required: true, message: "请输入失效日期", trigger: "blur"}
-        ],
-        sweepCount: [
-          {required: true, message: "请输入扫码数量", trigger: "blur"}
-        ]
-      },
-      sourceMap: {
-        "1": "web端新增单据",
-        "2": "第三方系统",
-        "3": "扫码单据转换",
-      },
-      orderStatusList: [
-        {
-          label: '未配货',
-          value: '2'
-        },
-        {
-          label: '待校验',
-          value: '3'
-        },
-        {
-          label: '已校验',
-          value: '4'
-        },
-        {
-          label: '已验收',
-          value: '5'
-        }
-      ],
-      submitStatusList: [
-        {
-          label: '未提交',
-          value: 0
-        },
-        {
-          label: '已提交',
-          value: 1
-        },
-        {
-          label: '提交失败',
-          value: 2
-        },
-      ],
-      detailFormVisible: false,
-      detailFormData: {},
-      detailFormLoading: false,
-      haveDistributionVisible: true,
-      actDateRange: [],
-      curRow: null,
-      pickerOptions: {
-        shortcuts: [
-          {
-            text: "最近一周",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-              picker.$emit("pick", [start, end]);
+    name: "stockOrderDelSearch",
+    data() {
+        return {
+            query: {
+                billType: null,
+                corpName: null,
+                locStorageCode: null,
+                startTime: "",
+                endTime: "",
+                billNo: "",
+                orderStatus: null,
+                submitStatus: null,
+                page: 1,
+                limit: 10
             },
-          },
-          {
-            text: "最近一个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
-              picker.$emit("pick", [start, end]);
+            detailQuery: {
+                orderIdFk: "",
+                page: 1,
+                limit: 20
             },
-          },
-          {
-            text: "最近三个月",
-            onClick(picker) {
-              const end = new Date();
-              const start = new Date();
-              start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
-              picker.$emit("pick", [start, end]);
+            busTypes: [],
+            list: [],
+            detailList: [],
+            total: 0,
+            detailTotal: 0,
+            storageList: [],
+            subInvList: [],
+            loading: false,
+            detailLoading: false,
+            idQuery: {
+                id: "",
             },
-          },
-        ],
-      }
-    }
-  },
-  methods: {
-    onReset() {
-      this.$router.push({
-        path: ""
-      });
-      this.query = {
-        billNo: "",
-        billType: '',
-        corpName: '',
-        orderStatus: null,
-        submitStatus: null,
-        startTime: "",
-        endTime: "",
-        page: 1,
-        limit: 10
-      };
-      this.getList();
-      this.haveDistributionVisible = true;
-      this.actDateRange = [];
-    },
-    onSubmit() {
-      if (this.actDateRange !== null) {
-        this.query.startTime = this.actDateRange[0];
-        this.query.endTime = this.actDateRange[1];
-      } else {
-        this.query.startTime = null;
-        this.query.endTime = null;
-      }
-      //手动点击查询按钮，每次都从第一页开始查询
-      this.query.page = 1;
-      this.getList();
-      if (this.query.status === "202" || this.query.status === "502") {
-        this.haveDistributionVisible = true;
-      } else {
-        this.haveDistributionVisible = false;
-      }
-    },
-    handleCurrentChange(val) {
-      this.query.page = val;
-      this.getList();
-    },
-    changeFun(row) {
-      let _this = this;
-      _this.multipId = []; //每次改动重置ID
-      row.forEach((item) => {
-        _this.multipId.push(item.id);
-      })
-    },
-    detailHandleCurrentChange(val) {
-      this.query.page = val;
-      this.getStockOrderDetailList();
-    },
-    // 刷新表单
-    resetForm() {
-      if (this.$refs["dataForm"]) {
-        // 清空验证信息表单
-        this.$refs["dataForm"].clearValidate();
-        // 刷新表单
-        this.$refs["dataForm"].resetFields();
-        this.getList();
-      }
-    },
-    getList() {
-      this.loading = true;
-      stockOrderUploadList(this.query).then((res) => {
-        this.loading = false;
-        if (res.code === 20000) {
-          this.list = res.data.list || [];
-          this.detailList = [];
-          this.total = res.data.total || 0;
-        }
-      }).catch((error) => {
-        this.loading = false;
-        this.list = [];
-        this.total = 0;
-        this.detailList = [];
-      })
-    },
-    closeDialog(type) {
-      this.distributionVisible = false;
-      this.stockChangeVisible = false;
-
-      this.getList();
-      if (this.$isNotBlank(type)) {
-        this.detailList = [];
-      }
-    },
-    getStockOrderDetailList(row) {
-      if (this.$isNotBlank(row)) {
-        this.detailQuery.orderIdFk = row.id;
-      }
-      this.detailLoading = true;
-      stockOrderDetail(this.detailQuery)
-          .then((response) => {
-            this.detailLoading = false;
-            this.detailList = response.data.list || [];
-          })
-          .catch(() => {
-            this.detailLoading = false;
-            this.detailList = [];
-          });
-    },
-    hideDetailForm() {
-      // 更改值
-      this.detailFormVisible = !this.detailFormVisible;
-      return true;
-    },
-    getActionName(action) {
-      for (let i = 0; i < this.busTypes.length; i++) {
-        if (this.busTypes[i].localAction === action) {
-          return this.busTypes[i].localName;
+            exportStatusMap: {
+                null: "未提交",
+                "1": "已提交",
+                "0": "未提交",
+            },
+            distributionVisible: false,
+            detailFormRules: {
+                batchNo: [
+                    {required: true, message: "请输入批次号", trigger: "blur"}
+                ],
+                productDate: [
+                    {required: true, message: "请输入生产日期", trigger: "blur"}
+                ],
+                expireDate: [
+                    {required: true, message: "请输入失效日期", trigger: "blur"}
+                ],
+                sweepCount: [
+                    {required: true, message: "请输入扫码数量", trigger: "blur"}
+                ]
+            },
+            sourceMap: {
+                "1": "web端新增单据",
+                "2": "第三方系统",
+                "3": "扫码单据转换",
+                "4": "采购计划转换",
+            },
+            orderStatusList: [
+                {
+                    label: '未配货',
+                    value: '2'
+                },
+                {
+                    label: '待校验',
+                    value: '3'
+                },
+                {
+                    label: '已校验',
+                    value: '4'
+                },
+                {
+                    label: '已验收',
+                    value: '5'
+                }
+            ],
+            submitStatusList: [
+                {
+                    label: '未提交',
+                    value: 0
+                },
+                {
+                    label: '已提交',
+                    value: 1
+                },
+                {
+                    label: '提交失败',
+                    value: 2
+                },
+            ],
+            detailFormVisible: false,
+            detailFormData: {},
+            detailFormLoading: false,
+            haveDistributionVisible: true,
+            actDateRange: [],
+            curRow: null,
+            pickerOptions: {
+                shortcuts: [
+                    {
+                        text: "最近一周",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近一个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                    {
+                        text: "最近三个月",
+                        onClick(picker) {
+                            const end = new Date();
+                            const start = new Date();
+                            start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
+                            picker.$emit("pick", [start, end]);
+                        },
+                    },
+                ],
+            }
         }
-      }
-    },
-    getBusType() {
-      let query = {
-        enabled: true,
-      };
-      getLocalJoinByUser(query)
-          .then((response) => {
-            this.busTypes = response.data.list || [];
-            this.filterQuery.billAction = this.busTypes[0].action;
-          })
-          .catch(() => {
-          });
     },
-    submitUploadDetail() {
-      this.$refs["dataForm"].validate(valid => {
-        if (valid) {
-          this.detailLoading = true;
-          let tQuery = this.detailFormData;
-          uploadStockOrderDetail(tQuery).then((response) => {
-            this.detailLoading = false;
-            if (response.code === 20000) {
-              this.$message.success("修改完成");
-              this.hideDetailForm();
-              this.getStockOrderDetailList();
+    methods: {
+        onReset() {
+            this.$router.push({
+                path: ""
+            });
+            this.query = {
+                billNo: "",
+                billType: '',
+                corpName: '',
+                orderStatus: null,
+                submitStatus: null,
+                startTime: "",
+                endTime: "",
+                page: 1,
+                limit: 10
+            };
+            this.getList();
+            this.haveDistributionVisible = true;
+            this.actDateRange = [];
+        },
+        onSubmit() {
+            if (this.actDateRange !== null) {
+                this.query.startTime = this.actDateRange[0];
+                this.query.endTime = this.actDateRange[1];
+            } else {
+                this.query.startTime = null;
+                this.query.endTime = null;
+            }
+            //手动点击查询按钮，每次都从第一页开始查询
+            this.query.page = 1;
+            this.getList();
+            if (this.query.status === "202" || this.query.status === "502") {
+                this.haveDistributionVisible = true;
             } else {
-              this.$alert(response.message, '提示', {
-                confirmButtonText: '确定',
-                type: 'warning',
-                closeOnClickModal: true,
-                callback: action => {
-                  this.$refs.inputRef.focus();
+                this.haveDistributionVisible = false;
+            }
+        },
+        handleCurrentChange(val) {
+            this.query.page = val;
+            this.getList();
+        },
+        changeFun(row) {
+            let _this = this;
+            _this.multipId = []; //每次改动重置ID
+            row.forEach((item) => {
+                _this.multipId.push(item.id);
+            })
+        },
+        detailHandleCurrentChange(val) {
+            this.query.page = val;
+            this.getStockOrderDetailList();
+        },
+        // 刷新表单
+        resetForm() {
+            if (this.$refs["dataForm"]) {
+                // 清空验证信息表单
+                this.$refs["dataForm"].clearValidate();
+                // 刷新表单
+                this.$refs["dataForm"].resetFields();
+                this.getList();
+            }
+        },
+        getList() {
+            this.loading = true;
+            stockOrderUploadList(this.query).then((res) => {
+                this.loading = false;
+                if (res.code === 20000) {
+                    this.list = res.data.list || [];
+                    this.detailList = [];
+                    this.total = res.data.total || 0;
                 }
-              });
+            }).catch((error) => {
+                this.loading = false;
+                this.list = [];
+                this.total = 0;
+                this.detailList = [];
+            })
+        },
+        closeDialog(type) {
+            this.distributionVisible = false;
+            this.stockChangeVisible = false;
+
+            this.getList();
+            if (this.$isNotBlank(type)) {
+                this.detailList = [];
             }
-          });
-        }
-      });
-    },
-    getStorageName(code) {
-      for (let i = 0; i < this.storageList.length; i++) {
-        if (this.storageList[i].code === code) {
-          return this.storageList[i].name;
-        }
-      }
-    },
-    getSubStorageName(code) {
-      for (let i = 0; i < this.subInvList.length; i++) {
-        if (this.subInvList[i].code === code) {
-          return this.subInvList[i].name;
-        }
-      }
-    },
+        },
+        getStockOrderDetailList(row) {
+            if (this.$isNotBlank(row)) {
+                this.detailQuery.orderIdFk = row.id;
+            }
+            this.detailLoading = true;
+            stockOrderDetail(this.detailQuery)
+                .then((response) => {
+                    this.detailLoading = false;
+                    this.detailList = response.data.list || [];
+                })
+                .catch(() => {
+                    this.detailLoading = false;
+                    this.detailList = [];
+                });
+        },
+        hideDetailForm() {
+            // 更改值
+            this.detailFormVisible = !this.detailFormVisible;
+            return true;
+        },
+        getActionName(action) {
+            for (let i = 0; i < this.busTypes.length; i++) {
+                if (this.busTypes[i].localAction === action) {
+                    return this.busTypes[i].localName;
+                }
+            }
+        },
+        getBusType() {
+            let query = {
+                enabled: true,
+            };
+            getLocalJoinByUser(query)
+                .then((response) => {
+                    this.busTypes = response.data.list || [];
+                    this.filterQuery.billAction = this.busTypes[0].action;
+                })
+                .catch(() => {
+                });
+        },
+        submitUploadDetail() {
+            this.$refs["dataForm"].validate(valid => {
+                if (valid) {
+                    this.detailLoading = true;
+                    let tQuery = this.detailFormData;
+                    uploadStockOrderDetail(tQuery).then((response) => {
+                        this.detailLoading = false;
+                        if (response.code === 20000) {
+                            this.$message.success("修改完成");
+                            this.hideDetailForm();
+                            this.getStockOrderDetailList();
+                        } else {
+                            this.$alert(response.message, '提示', {
+                                confirmButtonText: '确定',
+                                type: 'warning',
+                                closeOnClickModal: true,
+                                callback: action => {
+                                    this.$refs.inputRef.focus();
+                                }
+                            });
+                        }
+                    });
+                }
+            });
+        },
+        getStorageName(code) {
+            for (let i = 0; i < this.storageList.length; i++) {
+                if (this.storageList[i].code === code) {
+                    return this.storageList[i].name;
+                }
+            }
+        },
+        getSubStorageName(code) {
+            for (let i = 0; i < this.subInvList.length; i++) {
+                if (this.subInvList[i].code === code) {
+                    return this.subInvList[i].name;
+                }
+            }
+        },
 
-    getSubInvList() {
-      let query = {};
-      filterSubByInv(query)
-          .then((response) => {
-            this.subInvList = response.data || [];
-          })
-          .catch(() => {
-          });
-    },
+        getSubInvList() {
+            let query = {};
+            filterSubByInv(query)
+                .then((response) => {
+                    this.subInvList = response.data || [];
+                })
+                .catch(() => {
+                });
+        },
 
-    getStorage() {
-      this.storageList = [];
-      filterAllByUser()
-          .then((response) => {
-            this.storageList = response.data || [];
-            if (this.storageList.length > 0) {
-              this.query.locStorageCode = this.storageList[0].code;
-              this.getSubInvList();
-              this.getList();
-            }
-          })
-          .catch(() => {
-          });
-    },
-    myubmitOrder(row) {
-      let params = {id: row.id};
-      submitStockOrderToThirdSys(params).then((res) => {
-        if (res.code == 20000) {
-          this.$message({
-            type: "success",
-            message: "提交成功！"
-          });
-          this.getList();
-        } else {
-          this.$message.error(res.message);
-        }
-      }).catch((error) => {
-        this.$message.error("提交失败");
-      });
-    },
-    submitOrder(row) {
-      if (row.exportStatus == 1) {
-        this.$confirm("单据已经提交，是否重复提交？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-          center: true
-        }).then(() => {
-          this.myubmitOrder(row);
-        }).catch(() => {
-
-        })
-      } else {
-        this.$confirm("确定手动上传单据？", "提示", {
-          confirmButtonText: "确定",
-          cancelButtonText: "取消",
-          type: "warning",
-          center: true
-        }).then(() => {
-          this.myubmitOrder(row);
-        }).catch(() => {
-
-        })
-
-      }
-    },
+        getStorage() {
+            this.storageList = [];
+            filterAllByUser()
+                .then((response) => {
+                    this.storageList = response.data || [];
+                    if (this.storageList.length > 0) {
+                        this.query.locStorageCode = this.storageList[0].code;
+                        this.getSubInvList();
+                        this.getList();
+                    }
+                })
+                .catch(() => {
+                });
+        },
+        myubmitOrder(row) {
+            let params = {id: row.id};
+            submitStockOrderToThirdSys(params).then((res) => {
+                if (res.code == 20000) {
+                    this.$message({
+                        type: "success",
+                        message: "提交成功！"
+                    });
+                    this.getList();
+                } else {
+                    this.$message.error(res.message);
+                }
+            }).catch((error) => {
+                this.$message.error("提交失败");
+            });
+        },
+        submitOrder(row) {
+            if (row.exportStatus == 1) {
+                this.$confirm("单据已经提交，是否重复提交？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                    center: true
+                }).then(() => {
+                    this.myubmitOrder(row);
+                }).catch(() => {
+
+                })
+            } else {
+                this.$confirm("确定手动上传单据？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "warning",
+                    center: true
+                }).then(() => {
+                    this.myubmitOrder(row);
+                }).catch(() => {
 
-  },
+                })
 
+            }
+        },
 
-  components: {},
-  filters: {
-    statusFilterType(status) {
-      const statusMap = {
-        0: "gray",
-        1: "success"
-      };
-      return statusMap[status];
     },
-    statusFilterName(status) {
-      const statusMap = {
-        "1": "草稿",
-        "2": "未配货",
-        "3": "待校验",
-        "4": "已校验",
-        "5": "已核对",
-      };
-      return statusMap[status];
+
+
+    components: {},
+    filters: {
+        statusFilterType(status) {
+            const statusMap = {
+                0: "gray",
+                1: "success"
+            };
+            return statusMap[status];
+        },
+        statusFilterName(status) {
+            const statusMap = {
+                "1": "草稿",
+                "2": "未配货",
+                "3": "待校验",
+                "4": "已校验",
+                "5": "已核对",
+            };
+            return statusMap[status];
+        },
+        typeFilterName(type) {
+            const typeMap = {
+                1: "预入库",
+                2: "普通采购",
+            };
+            return typeMap[type];
+        }
     },
-    typeFilterName(type) {
-      const typeMap = {
-        1: "预入库",
-        2: "普通采购",
-      };
-      return typeMap[type];
-    }
-  },
 
-  created() {
-    this.getStorage();
-    this.getBusType();
-    let end = new Date();
-    let start = new Date();
-    start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
-    this.actDateRange = [start, end];
+    created() {
+        this.getStorage();
+        this.getBusType();
+        let end = new Date();
+        let start = new Date();
+        start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+        this.actDateRange = [start, end];
 
-  }
+    }
 }
 </script>
 
 <style scoped>
 
 .el-dialog {
-  display: flex;
-  flex-direction: column;
-  margin: 0 !important;
-  position: absolute;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%);
+    display: flex;
+    flex-direction: column;
+    margin: 0 !important;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
 }
 
 .el-dialog .el-dialog__body {
-  flex: 1;
-  overflow: auto;
+    flex: 1;
+    overflow: auto;
 }
 
 </style>
diff --git a/src/views/business/stockOrderWaitCheck.vue b/src/views/business/stockOrderWaitCheck.vue
index a6df9a8..a44a8e1 100644
--- a/src/views/business/stockOrderWaitCheck.vue
+++ b/src/views/business/stockOrderWaitCheck.vue
@@ -387,6 +387,7 @@ export default {
                 "1": "web端新增单据",
                 "2": "第三方系统",
                 "3": "扫码单据转换",
+                "4": "采购计划转换",
             },
             idQuery: {
                 id: "",
diff --git a/src/views/inout/stockOrderChange.vue b/src/views/inout/stockOrderChange.vue
index cc0893c..87d4966 100644
--- a/src/views/inout/stockOrderChange.vue
+++ b/src/views/inout/stockOrderChange.vue
@@ -258,6 +258,7 @@ export default {
                 "1": "web端新增单据",
                 "2": "第三方系统",
                 "3": "扫码单据转换",
+                "4": "采购计划转换",
             },
             fromTypeMap: {
                 "1": "UDIMS平台",
diff --git a/src/views/purchase/purPlan.vue b/src/views/purchase/purPlan.vue
index 47fd175..f8de056 100644
--- a/src/views/purchase/purPlan.vue
+++ b/src/views/purchase/purPlan.vue
@@ -264,7 +264,7 @@ export default {
                     this.loading = true;
                     let tQuery = {
                         editStatus: 2,
-                        purApplyEntity: row,
+                        purPlanEntity: row,
                     }
                     inserThrOrderWeb(tQuery)
                         .then(response => {
diff --git a/src/views/purchase/purPlanDetailDialog.vue b/src/views/purchase/purPlanDetailDialog.vue
index 5e9d7b3..8deb7e4 100644
--- a/src/views/purchase/purPlanDetailDialog.vue
+++ b/src/views/purchase/purPlanDetailDialog.vue
@@ -207,7 +207,7 @@
 <script>
 import draggable from "vuedraggable";
 import stockOrderNewSelectProduct from "../business/stockOrderNewSelectProduct";
-import {inserThrOrderWeb, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
+import {auditOrder, delApplyDetail, listApplyDetail} from "@/api/purchase/purPlan";
 import {filterAllByUser} from "@/api/basic/invWarehouse";
 import {filterSubByInv} from "@/api/basic/invSubWarehouse";
 
@@ -309,7 +309,7 @@ export default {
                 purPlanEntity: this.formData,
                 subErpOrders: this.codeArray,
             }
-            inserThrOrderWeb(tQuery)
+            auditOrder(tQuery)
                 .then(response => {
                     this.loading = false;
                     if (response.code === 20000) {
diff --git a/src/views/purchase/supCertAudit.vue b/src/views/purchase/supCertAudit.vue
index c1ffb94..971f427 100644
--- a/src/views/purchase/supCertAudit.vue
+++ b/src/views/purchase/supCertAudit.vue
@@ -436,7 +436,7 @@ export default {
                 1: "success",
                 2: "danger",
                 6: "warning",
-                4: "warning",
+                3: "warning",
             };
             return statusMap[status];
         },
diff --git a/src/views/purchase/supCertificationAdd.vue b/src/views/purchase/supCertificationAdd.vue
index 19df5bd..3b12ac4 100644
--- a/src/views/purchase/supCertificationAdd.vue
+++ b/src/views/purchase/supCertificationAdd.vue
@@ -318,7 +318,7 @@ export default {
                 0: "warning",
                 1: "success",
                 2: "danger",
-                4: "warning",
+                3: "warning",
                 6: "warning",
             };
             return statusMap[status];
diff --git a/src/views/purchase/supCompanyAdd.vue b/src/views/purchase/supCompanyAdd.vue
index 5af96f7..0ac4d65 100644
--- a/src/views/purchase/supCompanyAdd.vue
+++ b/src/views/purchase/supCompanyAdd.vue
@@ -92,7 +92,7 @@
                         <el-button
                             type="text"
                             size="small"
-                            v-if="scope.row.auditStatus === '2'"
+                            v-if="scope.row.auditStatus === 2"
                             @click.native.stop="rejectInfo(scope.row)"
                         >说明
                         </el-button>
diff --git a/src/views/purchase/supCompanyEditDialog.vue b/src/views/purchase/supCompanyEditDialog.vue
index 1e3d604..6700eee 100644
--- a/src/views/purchase/supCompanyEditDialog.vue
+++ b/src/views/purchase/supCompanyEditDialog.vue
@@ -154,7 +154,7 @@
                           style="width: 100%">
                     <el-table-column type="index" label="序号" width="50"></el-table-column>
                     <el-table-column label="证书名称" prop="name"></el-table-column>
-                    <el-table-column label="证书编号" prop="name"></el-table-column>
+                    <el-table-column label="证书编号" prop="code"></el-table-column>
                     <el-table-column label="有效期" prop="vailDate"></el-table-column>
                     <el-table-column label="失效期" prop="expireDate"></el-table-column>
                     <el-table-column label="审核状态" prop="auditStatus" width="120">
@@ -311,7 +311,7 @@ export default {
             required: true,
         },
         editType: {
-            type: Object,
+            type: Number,
             required: true,
         }
     },
diff --git a/src/views/purchase/supManufacturerEditDialog.vue b/src/views/purchase/supManufacturerEditDialog.vue
index 3c1cbd0..629ae0d 100644
--- a/src/views/purchase/supManufacturerEditDialog.vue
+++ b/src/views/purchase/supManufacturerEditDialog.vue
@@ -32,9 +32,9 @@
                         type="primary"
                         size="mini"
                         icon="search"
-                        v-if="inputQuery.auditStatus == 4|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
-                        @click="onModifySubmit(4)"
-                    >提交变更
+                        v-if="inputQuery.auditStatus == 3|| inputQuery.auditStatus == 1|| inputQuery.auditStatus == 2"
+                        @click="onModifySubmit(3)"
+                    >提交审核
                     </el-button
                     >
                 </div>
@@ -469,14 +469,14 @@ export default {
                 2: "编辑生产企业资质证书",
             },
             manufacturerId: null,
-            customerId:null,
+            customerId: null,
             selectCertVisible: false,
             certType: 2,
         };
     },
     created() {
 
-        console.log(this.fromType+"----------------------");
+        console.log(this.fromType + "----------------------");
 
         if (this.editType == 0) {
             this.inputQuery.manufacturerId = getUUID("")