修改

.env.dev

@@ -1,6 +1,6 @@
 NODE_ENV = 'development'
 VUE_APP_BUILD_TYPE='dev'
-VUE_APP_SERVER_URL='http://192.168.0.57:7001'
+VUE_APP_SERVER_URL='https://s.dev01.dkiboss.com:6010/api'
 # VUE_APP_SERVER_URL='https://s.dev01.dkiboss.com:6010/api'
 VUE_APP_UPLOAD_URL='https://s.dev01.dkiboss.com:6010/api/mdm-server/file/upload'
 VUE_APP_EXPORT_URL='http://localhost:5000/'

src/view/pur/pur-enter/form.vue

@@ -7,39 +7,39 @@
                 :rules="ruleInline"
                 @onValidate="onValidate" :labelMaxWords="5">
           <!--所属公司-->
-          <DkFormItem :errorMessage="getErrMessage('ascpId')" :required="true" prop="ascpId">
+          <DkFormItem :required="true" prop="ascpId">
             <SelectPop v-model="formData.ascpId" :options="companyList" :multiple="false" :clearable="false"
                        :disabled="true"
                        label-key="ascpName" value-key="cpId"/>
           </DkFormItem>
           <!--入库单号-->
-          <DkFormItem prop="entryNo" :errorMessage="getErrMessage('entryNo')" :required="true">
+          <DkFormItem prop="entryNo" :required="true">
             <InputPop v-model="formData.entryNo" :readonly="true"/>
           </DkFormItem>
           <!--供应商名称-->
-          <DkFormItem prop="supplierName" :errorMessage="getErrMessage('supplierName')" :required="true">
+          <DkFormItem prop="supplierName" :required="true">
             <SelectPop v-model="formData.supplierId" :options="supplierList" :multiple="false" :clearable="false"
                        :disabled="true"
                        label-key="supplierName" value-key="supplierId"/>
           </DkFormItem>
           <!--发货日期-->
-          <DkFormItem prop="sale1OutDate" :errorMessage="getErrMessage('sale1OutDate')">
+          <DkFormItem prop="sale1OutDate">
             <InputPop v-model="formData.sale1OutDate" :readonly="true"/>
           </DkFormItem>
           <!--联系人-->
-          <DkFormItem prop="consignee" :errorMessage="getErrMessage('customerName')">
+          <DkFormItem prop="consignee">
             <InputPop v-model="formData.customerName" :readonly="true"/>
           </DkFormItem>
           <!--联系电话-->
-          <DkFormItem prop="consigneePhone" :errorMessage="getErrMessage('customerPhone')">
+          <DkFormItem prop="consigneePhone">
             <InputPop :telephone="true" v-model="formData.customerPhone" maxlength="11" :readonly="true"/>
           </DkFormItem>
           <!--详细地址-->
-          <DkFormItem :errorMessage="getErrMessage('addressFull')" prop="takeOverAddress">
+          <DkFormItem prop="takeOverAddress">
             <InputPop ref="addressFull" :readonly="true" v-model="formData.addressFull"/>
           </DkFormItem>
           <!--收货仓库-->
-          <DkFormItem prop="receivingWh" :errorMessage="getErrMessage('receivingWh')" :required="true">
+          <DkFormItem prop="receivingWh" :required="true">
             <SelectPop v-model="formData.entryWhId" :options="warehouseList" :multiple="false" :clearable="false"
                        label-key="whName" value-key="whId" :disabled="entryStatus===3 || entryStatus === -2"
                        @on-select="changeItemWhId"/>
@@ -50,74 +50,62 @@
                            type="date" :short-cut-flag="true" :readonly="true"/>
           </DkFormItem>
           <!--备注-->
-          <DkFormItem prop="remarks" :errorMessage="getErrMessage('remarks')">
+          <DkFormItem prop="remarks">
             <InputPop v-model="formData.remarks" maxlength=500 textareaFlag/>
           </DkFormItem>
         </DkForm>
       </DkPanel>
+      <DkPanel prop="goodsInformation">
+        <div slot="content">
+          <EditTable ref="table-select" :data="formData.orderEntryItemList"
+                     :columns-social="goodsSkuColumns"
+                     :columns="visUserSensitive? goodsSkuColumns : goodsSkuColumns.filter(it => !it.flgUserSensitive)"
+                     enabledRepeatId="skuId"
+                     controlId="skuId"
+                     :height="this.tableHeight-60 - 60"
+                     :showSeqBtnFlag="false"
+                     :enabledRepeat="true"
+                     :newRowFlag="false"
+                     :readonly="entryStatus===3"
+                     :flgHidePrice="!visUserSensitive"
+          ></EditTable>
+
+          <DkForm ref="goodsFootFormData" v-model="goodsFootFormData" :labelMaxWords="5" name="dk-form"
+                  class="form-content-class">
+            <!--货物金额-->
+            <DkFormItem prop="sumGoodsAmount">
+              <InputNumberPop ref="sumGoodsAmount" v-model="goodsFootFormData.sumGoodsAmount"
+                              :clearable="false"
+                              :digits="2"
+                              :readonly="true"/>
+            </DkFormItem>
+            <!--总重量-->
+            <DkFormItem prop="sumWeight">
+              <InputNumberPop ref="sumWeight" v-model="goodsFootFormData.sumWeight" :digits="2"
+                              :readonly="true" unit="KG"/>
+            </DkFormItem>
+            <!--总体积-->
+            <DkFormItem prop="sumVolume">
+              <InputNumberPop ref="sumVolume" v-model="goodsFootFormData.sumVolume" :digits="2"
+                              :readonly="true" unit="m³"/>
+            </DkFormItem>
+          </DkForm>
+        </div>
+      </DkPanel>
+      <!--附件-->
+      <DkPanel prop="files">
+        <div id="search-cond-div-files-info" ref="search-cond-div-files-info"
+             slot="content">
+          <DkPicWall v-model="formData.annexPaths" :disabled="this.allCanNoEdit?true:false"
+                     folder="t_order/annex_paths" :accept="$config.uploadFileConfig.acceptPicType"
+                     :format="['jpg','jpeg','png']"></DkPicWall>
+        </div>
+      </DkPanel>
     </DkCollapse>
     <DkButton style="z-index: 100;position: absolute;right: 4%;" @click="click()">
       {{ $t('barcode') }}
     </DkButton>
 
-    <div style="display: flex;">
-      <DkCollapse @on-change="changeCollapse" ref="collapse">
-        <DkPanel prop="goodsInformation">
-          <div id="search-cond-div-goods-info" ref="search-cond-div-goods-info"
-               slot="content">
-            <EditTable ref="table-select" :data="formData.orderEntryItemList"
-                       :columns-social="goodsSkuColumns"
-                       :columns="visUserSensitive? goodsSkuColumns : goodsSkuColumns.filter(it => !it.flgUserSensitive)"
-                       enabledRepeatId="skuId"
-                       controlId="skuId"
-                       :height="this.tableHeight-60 - 60"
-                       :showSeqBtnFlag="false"
-                       :enabledRepeat="true"
-                       :newRowFlag="false"
-                       :readonly="entryStatus===3"
-                       v-if="entryStatus"
-                       :flgHidePrice="!visUserSensitive"
-            ></EditTable>
-            <div>
-              <DkForm ref="goodsFootFormData" v-model="goodsFootFormData" :labelMaxWords="5" name="dk-form"
-                      class="form-content-class">
-                <!--货物金额-->
-                <DkFormItem prop="sumGoodsAmount">
-                  <InputNumberPop ref="sumGoodsAmount" v-model="goodsFootFormData.sumGoodsAmount"
-                                  :clearable="false"
-                                  :digits="2"
-                                  :readonly="true"/>
-                </DkFormItem>
-                <!--总重量-->
-                <DkFormItem prop="sumWeight">
-                  <InputNumberPop ref="sumWeight" v-model="goodsFootFormData.sumWeight" :digits="2"
-                                  :readonly="true" unit="KG"/>
-                </DkFormItem>
-                <!--总体积-->
-                <DkFormItem prop="sumVolume">
-                  <InputNumberPop ref="sumVolume" v-model="goodsFootFormData.sumVolume" :digits="2"
-                                  :readonly="true" unit="m³"/>
-                </DkFormItem>
-              </DkForm>
-            </div>
-          </div>
-        </DkPanel>
-      </DkCollapse>
-    </div>
-
-    <!--附件-->
-    <div style="display: flex;margin-bottom: 80px">
-      <DkCollapse @on-change="changeCollapse" ref="collapse">
-        <DkPanel prop="files">
-          <div id="search-cond-div-files-info" ref="search-cond-div-files-info"
-               slot="content">
-            <DkPicWall v-model="formData.annexPaths" :disabled="this.allCanNoEdit?true:false"
-                       folder="t_order/annex_paths" :accept="$config.uploadFileConfig.acceptPicType"
-                       :format="['jpg','jpeg','png']"></DkPicWall>
-          </div>
-        </DkPanel>
-      </DkCollapse>
-    </div>
 
     <!--  下部分按钮区域  -->
     <DkSaveButton :viewFlag="entryStatus === -2" ref="saveButton" :loading="loading" @save="submitForm"
@@ -266,7 +254,7 @@ export default {
   methods: {
     /**
      * @desc   : 总单仓库修改明细仓库
-     * @author : 常皓宁
+     * @author : 付斌
      * @date   : 2023/11/21 9:05
      */
     changeItemWhId() {
@@ -282,9 +270,9 @@ export default {
       }
     },
     /**
-     *   @desc   : 选择地址
-     *   @date   : 2022/6/9 19:15
-     *   @author : 寇珊珊
+     * @desc   : 选择地址
+     * @author : 付斌
+     * @date   : 2024-02-20 8:50
      */
     chooseAddress(value) {
       this.formData.supplierDistrict = value;
@@ -304,8 +292,8 @@ export default {
     },
     /**
      * @desc   : 保存的提交事件
-     * @author : 常皓宁
-     * @date   : 2023/8/30 14:34
+     * @author : 付斌
+     * @date   : 2024-02-20 14:34
      */
     submitForm() {
       this.$refs['formInline'].validate().then(valid => {
@@ -321,8 +309,8 @@ export default {
 
     /**
      * @desc   : 查看条码
-     * @author : 常皓宁
-     * @date   : 2023/8/31 9:04
+     * @author : 付斌
+     * @date   : 2024-02-20 9:04
      */
     click() {
       this.barCodeModel = true
@@ -330,32 +318,32 @@ export default {
 
     /**
      * @desc   : 保存
-     * @author : 常皓宁
-     * @date   : 2023/8/30 14:35
+     * @author : 付斌
+     * @date   : 2024-02-20 14:35
      */
     saveOrderEntry(params) {
 
     },
     /**
      * @desc   : 通过id查询
-     * @author : 常皓宁
-     * @date   : 2023/8/30 14:35
+     * @author : 付斌
+     * @date   : 2024-02-20 14:35
      */
     detail(id) {
 
     },
     /**
      * @desc   : 获取明细
-     * @author : 常皓宁
-     * @date   : 2023/8/31 9:55
+     * @author : 付斌
+     * @date   : 2024-02-20 9:55
      */
     getStandardDetail() {
 
     },
     /**
      * @desc   : 返回一览页面
-     * @author : 常皓宁
-     * @date   : 2023/8/30 14:35
+     * @author : 付斌
+     * @date   : 2024-02-20 14:35
      */
     btnGroupClick() {
       this.formData = {}
@@ -371,40 +359,32 @@ export default {
     },
     /**
      * @desc   : 查询所属公司
-     * @author : 常皓宁
-     * @date   : 2023/8/8 11:28
+     * @author : 付斌
+     * @date   : 2024-02-20 11:28
      */
     getCompany() {
 
     },
     /**
      * @desc   : 查询所属供应商
-     * @author : 常皓宁
-     * @date   : 2023/8/30 14:36
+     * @author : 付斌
+     * @date   : 2024-02-20 14:36
      */
     getSupplier() {
 
     },
     /**
      * @desc   : 查询收货仓库
-     * @author : 常皓宁
-     * @date   : 2023/8/30 14:36
+     * @author : 付斌
+     * @date   : 2024-02-20 14:36
      */
     getWarehouse() {
 
     },
     /**
-     * @desc   : 校验
-     * @author : 常皓宁
-     * @date   : 2023/8/8 13:06
-     */
-    getErrMessage(prop) {
-      return this.errMessage[prop]
-    },
-    /**
-     *   @desc   : 获取商品表格中数量、金额后计算总单信息
-     *   @date   : 2022/5/30 15:31
-     *   @author : 寇珊珊
+     * @desc   : 获取商品表格中数量、金额后计算总单信息
+     * @author : 付斌
+     * @date   : 2024-02-20 8:48
      */
     getTotals(orderEntryItemList) {
       let table = orderEntryItemList
@@ -450,26 +430,13 @@ export default {
     },
     /**
      * @desc   : 动态加载区域
-     * @author : 洪旭东
-     * @date   : 2022-05-30 11:11
+     * @author : 付斌
+     * @date   : 2024-02-20 8:48
      */
     loadArea(item, callback) {
 
     },
-    /**
-     * @desc   : 校验
-     * @author : 常皓宁
-     * @date   : 2023/8/8 13:06
-     */
-    onValidate({prop, status, error}) {
-      this.$set(this.errMessage, prop, error)
-    },
   },
-  /**
-   * @desc   : 下拉控件数据源加载
-   * @author : 常皓宁
-   * @date   : 2023/8/8 13:07
-   */
   created() {
     // 根据用户敏感信息，设置隐藏列
     let us = this.$store.state.user.userSensitive.filter(f => f.isCheck && f.docCode == this.$config.docCode.fxPurchaseOrder

src/view/pur/pur-order/form.vue

@@ -1,33 +1,34 @@
 <!-- @desc:采购订单新建编辑  @auth:付斌  @time:2024/1/30 15:15 -->
 <template>
   <div class="main-div" style="position: relative;">
-    <DkButton type="primary" style="position:fixed;right: 100px;z-index: 1000;height: 30px;margin-top: 10px"
-              v-if="this.type == this.$config.formMode.add"
-              @click="purchaseBasedOnSales(true)"> {{ $t('purchaseBasedOnSales') }}
-    </DkButton>
+    <!--按钮区-->
+    <BaseIndexButtonGroup ref="BaseIndexButtonGroup1" id="BaseIndexButtonGroup1">
+      <template #right>
+        <!--   新建     -->
+        <BaseIndexButton ref="purchaseBasedOnSales" name="purchaseBasedOnSales"></BaseIndexButton>
+      </template>
+    </BaseIndexButtonGroup>
+
     <DkCollapse @on-change="changeCollapse" ref="collapse">
       <DkPanel prop="essentialInformation">
-
         <!--  单据信息  -->
         <DkForm slot="content" ref="formInline" v-model="formData" :rules="ruleInline" name="dk-form"
                 style="width:100%" @onValidate="onValidate" :label-max-words="5">
           <!--所属公司-->
-          <DkFormItem :errorMessage="getErrMessage('ascpId')" :label="$t('affiliatedCompany')"
-                      prop="ascpId" :required="true">
+          <DkFormItem :label="$t('affiliatedCompany')" prop="ascpId" :required="true">
             <SelectMagnifier v-model="formData.ascpId" :displayText="formData.cpName"
                              :type="this.$config.MagnifierType.company"
                              :readonly="checkColumnIsEdit('ascpId')"
                              @ok="ascpIdOk"
                              :initSearchFlag="true"
-                             searchType="S"/>
+                             :multiple="false"/>
           </DkFormItem>
           <!--采购单号-->
           <DkFormItem prop="orderNo" :label="$t('procureOrderNo')">
             <InputPop ref="orderNo" v-model="formData.orderNo" :readonly="true"/>
           </DkFormItem>
           <!--供应商-->
-          <DkFormItem prop="supplierId" :label="$t('supplier')" :required="true"
-                      :errorMessage="getErrMessage('supplierId')">
+          <DkFormItem prop="supplierId" :label="$t('supplier')" :required="true">
             <SelectMagnifier v-model="formData.supplierId" :display-text="formData.supplierName"
                              :type="this.$config.MagnifierType.supplier"
                              :other-condition="{cpId:$store.state.user.cpId,
@@ -35,10 +36,10 @@
                              @ok="supplierOk"
                              :initSearchFlag="true"
                              :readonly="checkColumnIsEdit('supplierId')"
-                             searchType="S"/>
+                             :multiple="false"/>
           </DkFormItem>
           <!--预计收货时间-->
-          <DkFormItem :errorMessage="getErrMessage('entryTime')" :label="$t('expectedDeliverDate')"
+          <DkFormItem :label="$t('expectedDeliverDate')"
                       prop="entryTime" :required="false">
             <DatePickerPop v-model="formData.entryTime"
                            :placeholder="$t('inputWords',{'search-name':$t('entryTime')})"
@@ -46,14 +47,13 @@
                            type="date" :short-cut-flag="true"/>
           </DkFormItem>
           <!--收货仓库-->
-          <DkFormItem prop="entryWhId" :label="$t('receivingWarehouse')" :required="true"
-                      :errorMessage="getErrMessage('entryWhId')">
+          <DkFormItem prop="entryWhId" :label="$t('receivingWarehouse')" :required="true" :data-type="$config.dataType.number">
             <SelectMagnifier v-model="formData.entryWhId" :displayText="formData.warehouseName"
                              :type="this.$config.MagnifierType.warehousePurchase"
                              @ok="warehouseOk"
                              :other-condition="{flgValid: true, ascpId: $store.state.user.ascpId}"
                              :initSearchFlag="true"
-                             searchType="S"/>
+                            :multiple="false"/>
           </DkFormItem>
           <!--收货人-->
           <DkFormItem prop="contactName" :label="$t('consignee')" :required="true">
@@ -63,7 +63,7 @@
                              @ok="addressOk"
                              :initSearchFlag="true"
                              :readonly="checkColumnIsEdit('contactName')"
-                             searchType="S"/>
+                             :multiple="false"/>
           </DkFormItem>
           <!--收货电话-->
           <DkFormItem prop="contactPhones" :label="$t('consigneePhone')">
@@ -79,15 +79,14 @@
           <!--                </Col>-->
           <!--                &lt;!&ndash;门牌号&ndash;&gt;-->
           <!--                <Col class="Col" span="6">-->
-          <!--                  <DkFormItem :errorMessage="getErrMessage('addressNo')" prop="addressNo" :required="true">-->
+          <!--                  <DkFormItem prop="addressNo" :required="true">-->
           <!--                    <InputPop ref="addressNo"-->
           <!--                              v-model="formData.addressNo"-->
           <!--                              @input="setAddressFull"/>-->
           <!--                  </DkFormItem>-->
           <!--                </Col>-->
           <!--收货地址-->
-          <DkFormItem :label="$t('takeOverAddress')" :errorMessage="getErrMessage('addressFull')"
-                      prop="addressFull" :required="true">
+          <DkFormItem :label="$t('takeOverAddress')" prop="addressFull" :required="true">
             <InputPop ref="addressFull" :readonly="true" v-model="formData.addressFull"/>
           </DkFormItem>
           <!--备注-->
@@ -97,85 +96,76 @@
           </DkFormItem>
         </DkForm>
       </DkPanel>
-    </DkCollapse>
-
-    <!--商品信息-->
-    <div style="display: flex;margin-top: 30px">
-      <DkCollapse @on-change="changeCollapse" ref="collapse">
-        <DkPanel prop="goodsInformation">
-          <div id="search-cond-div-goods-info" ref="search-cond-div-goods-info"
-               slot="content">
-            <EditTreeTable ref="goodsTable" :data="formData.goodsList" showFooter exchange-field="replaceableSku"
-                           major-field="itemId"
-                           combined-field="promotionId"
-                           :new-row-flag="!(!this.formData.orgId)"
-                           :readonly="checkColumnIsEdit('goodsTable')"
-                           :amount-name="this.type == this.$config.formMode.add?'itemAmount':'tItemAmount'"
-                           :columns-social="(this.type == this.$config.formMode.add
+      <!--商品信息-->
+      <DkPanel prop="goodsInformation">
+        <div id="search-cond-div-goods-info" ref="search-cond-div-goods-info"
+             slot="content">
+          <EditTreeTable ref="goodsTable" :data="formData.goodsList" showFooter exchange-field="replaceableSku"
+                         major-field="itemId"
+                         combined-field="promotionId"
+                         :new-row-flag="!(!this.formData.orgId)"
+                         :readonly="checkColumnIsEdit('goodsTable')"
+                         :amount-name="this.type == this.$config.formMode.add?'itemAmount':'tItemAmount'"
+                         :columns-social="(this.type == this.$config.formMode.add
                                     || this.type == this.$config.formMode.approval)?goodsColumns:goodsColumnsEdit"
-                           :columns="(this.type == this.$config.formMode.add
+                         :columns="(this.type == this.$config.formMode.add
                                     || this.type == this.$config.formMode.approval)?(visUserSensitive? goodsColumns : goodsColumns.filter(it => !it.flgUserSensitive))
                                     :(visUserSensitive ?goodsColumnsEdit : goodsColumnsEdit.filter(it => !it.flgUserSensitive))"
-                           :orgId="this.formData.orgId"
-                           :customerId="this.formData.customerId"
-                           :saleChannelCode="this.formData.salesChannelCode"
-                           :defWhId="this.formData.defWhId"
-                           :supplierWhName="this.formData.supplierWhName"
-                           :entryWhId="this.formData.entryWhId"
-                           :purchaseWhFlag="true"
-                           :flgHidePrice="!visUserSensitive"
-                           controlId="skuId"
-                           @on-choose="getTotals"
-                           @changeValue="changeValue"
-                           :height="400"
-            ></EditTreeTable>
-            <div>
-              <DkForm slot="content" ref="goodsFootFormData" v-model="goodsFootFormData" :labelMaxWords="5"
-                      name="dk-form"
-                      class="form-content-class">
-                <DkRow>
-                  <!--货物金额-->
-                  <Col class="Col" span="6" v-if="visUserSensitive">
-                    <DkFormItem prop="sumGoodsAmount">
-                      <InputNumberPop ref="sumGoodsAmount" v-model="goodsFootFormData.sumGoodsAmount" :clearable="false"
-                                      :digits="2" :readonly="true"/>
-                    </DkFormItem>
-                  </Col>
-                  <!--总重量-->
-                  <Col class="Col" span="6">
-                    <DkFormItem prop="sumWeight">
-                      <InputNumberPop ref="sumWeight" v-model="goodsFootFormData.sumWeight" :digits="2"
-                                      :readonly="true" unit="KG"/>
-                    </DkFormItem>
-                  </Col>
-                  <!--总体积-->
-                  <Col class="Col" span="6">
-                    <DkFormItem prop="sumVolume">
-                      <InputNumberPop ref="sumVolume" v-model="goodsFootFormData.sumVolume" :digits="2"
-                                      :readonly="true" unit="m³"/>
-                    </DkFormItem>
-                  </Col>
-                </DkRow>
-              </DkForm>
-            </div>
+                         :orgId="this.formData.orgId"
+                         :customerId="this.formData.customerId"
+                         :saleChannelCode="this.formData.salesChannelCode"
+                         :defWhId="this.formData.defWhId"
+                         :supplierWhName="this.formData.supplierWhName"
+                         :entryWhId="this.formData.entryWhId"
+                         :purchaseWhFlag="true"
+                         :flgHidePrice="!visUserSensitive"
+                         controlId="skuId"
+                         @on-choose="getTotals"
+                         @changeValue="changeValue"
+                         :height="400"
+          ></EditTreeTable>
+          <div>
+            <DkForm slot="content" ref="goodsFootFormData" v-model="goodsFootFormData" :labelMaxWords="5"
+                    name="dk-form"
+                    class="form-content-class">
+              <DkRow>
+                <!--货物金额-->
+                <Col class="Col" span="6" v-if="visUserSensitive">
+                  <DkFormItem prop="sumGoodsAmount">
+                    <InputNumberPop ref="sumGoodsAmount" v-model="goodsFootFormData.sumGoodsAmount" :clearable="false"
+                                    :digits="2" :readonly="true"/>
+                  </DkFormItem>
+                </Col>
+                <!--总重量-->
+                <Col class="Col" span="6">
+                  <DkFormItem prop="sumWeight">
+                    <InputNumberPop ref="sumWeight" v-model="goodsFootFormData.sumWeight" :digits="2"
+                                    :readonly="true" unit="KG"/>
+                  </DkFormItem>
+                </Col>
+                <!--总体积-->
+                <Col class="Col" span="6">
+                  <DkFormItem prop="sumVolume">
+                    <InputNumberPop ref="sumVolume" v-model="goodsFootFormData.sumVolume" :digits="2"
+                                    :readonly="true" unit="m³"/>
+                  </DkFormItem>
+                </Col>
+              </DkRow>
+            </DkForm>
           </div>
-        </DkPanel>
-      </DkCollapse>
-    </div>
+        </div>
+      </DkPanel>
+      <!--附件-->
+      <DkPanel prop="files">
+        <div id="search-cond-div-files-info" ref="search-cond-div-files-info"
+             slot="content">
+          <DkPicWall v-model="formData.annexPaths" :disabled="this.allCanNoEdit?true:false"
+                     folder="t_order/annex_paths" :accept="$config.uploadFileConfig.acceptPicType"
+                     :format="['jpg','jpeg','png']"></DkPicWall>
+        </div>
+      </DkPanel>
+    </DkCollapse>
 
-    <!--附件-->
-    <div style="display: flex;margin-bottom: 80px">
-      <DkCollapse @on-change="changeCollapse" ref="collapse">
-        <DkPanel prop="files">
-          <div id="search-cond-div-files-info" ref="search-cond-div-files-info"
-               slot="content">
-            <DkPicWall v-model="formData.annexPaths" :disabled="this.allCanNoEdit?true:false"
-                       folder="t_order/annex_paths" :accept="$config.uploadFileConfig.acceptPicType"
-                       :format="['jpg','jpeg','png']"></DkPicWall>
-          </div>
-        </DkPanel>
-      </DkCollapse>
-    </div>
     <!--      下部分按钮区域-->
     <!--分销订单-->
     <DkSaveButton
@@ -247,7 +237,7 @@
                              :display-text="purchaseBasedOnSalesFormData.orgName"
                              :type="this.$config.MagnifierType.organization"
                              :other-condition="{cpId:$store.state.user.cpId}"
-                             searchType="S"/>
+                             :multiple="false"/>
           </DkFormItem>
           <!--送货日期-->
           <DkFormItem prop="deliveryTime">
@@ -1520,23 +1510,6 @@ export default {
         }
       }
     },
-    /**
-     * @desc   : 获取错误信息
-     * @author : 付斌
-     * @date   : 2024-02-19 10:47
-     */
-    getErrMessage(prop) {
-      return this.errMessage[prop]
-    },
-    /**
-     * @desc   : 保存校验
-     * @author : 付斌
-     * @date   : 2024-02-19 10:47
-     */
-    onValidate({prop, status, error}) {
-      this.$set(this.errMessage, prop, error)
-    },
-
     /***************************设定参数函数************************************/
 
     /**