Merge remote-tracking branch 'origin/mergeBranch' into mergeBranch

src/HDrpManagement/dispatch/details/index.vue

@@ -1,39 +1,39 @@
 <template>
     <div>
-      <basicDetails
-          ref="details"
-          :titleText="`${mainData.billno}`"
-          :oldFormPath="{edit:'HDrpManagement/dispatch/modules'}"
-          :editData="mainData"
-          :mainAreaData="mainAreaData"
-          delApiId="20221114135503"
-          turnPageId="20221114135403"
-          idname="sa_dispatchid"
-          ownertable="sa_dispatch"
-          tags=""
-          :tabs="['基础信息','发货明细']"
-          @pageChange="pageChange"
-          @onEditSuccess="queryMainData($route.query.id)">
-        <div slot="tags">
-        </div>
-        <div slot="customOperation">
-          <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck">{{mainData.STATUS === '审核'?'反审':mainData.STATUS === '复核'?'反审':'审核'}}</el-button>
-          <el-button  class="inline-16" type="primary" size="mini" v-if="tool.checkAuth($route.name,'recheck')" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck">{{mainData.STATUS === '复核'?'反复核':'复核'}}</el-button>
-        </div>
-        <div slot="slot0" >
-          <default-info :mainData="mainData"></default-info>
-        </div>
-        <div slot="slot1" >
-          <product-list :mainData="mainData"></product-list>
-        </div>
-      </basicDetails>
-    </div>
-  </template>
-  
-  <script>
-  import productList from '../modules/productlist.vue'
-  import defaultInfo from '../modules/defaultInfo.vue'
-import { log } from '@antv/g2plot/lib/utils'
+    <basicDetails
+        ref="details"
+        :titleText="`${mainData.billno}`"
+        :oldFormPath="{edit:'HDrpManagement/dispatch/modules'}"
+        :editData="mainData"
+        :mainAreaData="mainAreaData"
+        delApiId="20221114135503"
+        turnPageId="20221114135403"
+        idname="sa_dispatchid"
+        ownertable="sa_dispatch"
+        tags=""
+        :tabs="['基础信息','发货明细']"
+        @pageChange="pageChange"
+        @onEditSuccess="queryMainData($route.query.id)">
+      <div slot="tags">
+      </div>
+      <div slot="customOperation">
+        <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '复核'" @click="addLogistics">生成物流单</el-button>
+        <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.STATUS !== '新建' && mainData.STATUS !== '审核'" @click="onCheck">{{mainData.STATUS === '审核'?'反审':mainData.STATUS === '复核'?'反审':'审核'}}</el-button>
+        <el-button  class="inline-16" type="primary" size="mini" v-if="tool.checkAuth($route.name,'recheck')" :disabled="mainData.STATUS !== '审核' && mainData.STATUS !== '复核'" @click="onReCheck">{{mainData.STATUS === '复核'?'反复核':'复核'}}</el-button>
+      </div>
+      <div slot="slot0" >
+        <default-info :mainData="mainData"></default-info>
+      </div>
+      <div slot="slot1" >
+        <product-list :mainData="mainData"></product-list>
+      </div>
+    </basicDetails>
+  </div>
+</template>
+
+<script>
+import productList from '../modules/productlist.vue'
+import defaultInfo from '../modules/defaultInfo.vue'
   export default {
     name: "detail",
     data() {
@@ -182,6 +182,21 @@ import { log } from '@antv/g2plot/lib/utils'
           });          
         });
       },
+      async addLogistics () {
+        const res = await this.$api.requested({
+          "id": "20230216185104",
+          "content": {
+            "sa_dispatchid":this.mainData.sa_dispatchid
+          }
+        })
+        
+        this.tool.showMessage(()=>{
+          let route = this.$route
+          this.oldRoute = {path:route.path,query:route.query}
+          this.$store.dispatch('setHistoryRouter',this.oldRoute)
+          this.$router.replace({path:'/logisticsdetail',query:{id:res.data.sa_logisticsid,rowindex:res.data.rowindex}})
+        })
+      }
     },
     mounted () {
       this.queryMainData(this.$route.query.id)

src/HDrpManagement/dispatch/modules/edit.vue

@@ -179,7 +179,6 @@ export default {
           "sa_dispatchid":this.data.sa_dispatchid,
           "sa_orderid":0,
           "sys_enterpriseid":this.data.sys_enterpriseid,
-          "sa_logiscompid":this.defaultData.logist_info.sa_logiscompid,
           "rec_contactsid":this.defaultData.re_info.contactsid,
           "billdate":this.defaultData.billdate,
           "freightstatus":this.defaultData.freightstatus,

src/HDrpManagement/dispatch/modules/productlist.vue

@@ -62,7 +62,7 @@
         width="120px"
         label="drp可发货数量">
       </el-table-column>
-      <el-table-column v-if="type === 'edit'" width="90" fixed="right">
+      <el-table-column label="操作" v-if="type === 'edit'" width="90">
         <template slot-scope="scope">
           <el-button type="text" size="mini" @click="deleteOrderProduct(scope.row)">删 除</el-button>
         </template>

src/HDrpManagement/logistics/details/index.vue

@@ -16,14 +16,9 @@
         <div slot="tags">
         </div>
         <div slot="customOperation" >
-<<<<<<< HEAD
-          <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status === '收货'" @click="onConfimRec">确认收货</el-button>
-          <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status === '收货'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
-=======
           <Edit class="inline-16" v-if="tool.checkAuth($route.name,'update')" :data="mainData" @onSuccess="queryMainData(),$refs.dispatch.listData()"/>
           <el-button type="primary" size="mini"  v-if="tool.checkAuth($route.name,'confirmRec')" :disabled="mainData.status !== '收货'" @click="onConfimRec">确认收货</el-button>
           <el-button class="inline-16" type="primary" size="mini"  v-if="tool.checkAuth($route.name,'check')" :disabled="mainData.status !== '收货'" @click="onCheck">{{mainData.status === '审核'?'反审':'审核'}}</el-button>
->>>>>>> f9c8967a8aa0821b6d96a17a6ea9db06adb24d7d
         </div>
         <div slot="slot0" >
           <defalutInfo :mainData="mainData" ref="info"></defalutInfo>

src/HDrpManagement/orderManage/details/index.vue

@@ -12,7 +12,7 @@
         delApiId="20221108152102"
         tags=""
         :statusCheck="[{key:'status',value:'审核'},{key:'status',value:'提交'},{key:'status',value:'关闭'}]"
-        :tabs="['基本信息','订单明细','订单进度','居间费明细','发货单','物流单','发票记录']"
+        :tabs="['基本信息','订单明细','订单进度','居间费明细','发货单','物流单','发票记录','收支明细']"
         @pageChange="pageChange"
         @onEditSuccess="queryMainData($route.query.id)">
         <div slot="customOperation" class="inline-16">
@@ -39,7 +39,6 @@
             </div>
             <el-button class="inline-16" v-if="tool.checkAuth($route.name,'examine')"  :disabled="mainData.status !== '提交' && mainData.status !== '交期确认'" type="primary" size="mini" slot="reference">审 核</el-button>
           </el-popover>
-          
           <el-button v-if="tool.checkAuth($route.name,'examine')" :disabled="mainData.status !== '审核'" type="primary" size="mini" @click="onReturnCheck">反审核</el-button>
           <el-button v-if="tool.checkAuth($route.name,'reback')" :disabled="mainData.status !== '提交' && mainData.status !== '交期待确认'" type="primary" size="mini" @click="dialogVisible = true">退 回</el-button>
           <el-button v-if="tool.checkAuth($route.name,'submit')" :disabled="mainData.status !== '新建'"  type="primary" size="mini" @click="onSubmit('提交')">提 交</el-button>
@@ -50,7 +49,10 @@
         <default-info :mainData="mainData"></default-info>
       </div>
       <div slot="slot1">
-        <product-list :data="mainData" ref="prod"></product-list>
+        
+        <product-list @select="select" :data="mainData" ref="prod">
+          <el-button :disabled="mainData.status !== '审核'" slot="operation" size="small" type="primary" style="margin-bottom:12px" @click="adddispatch">一键发货</el-button>
+        </product-list>
       </div>
       <div slot="slot2">
         <orderprogress></orderprogress>
@@ -101,7 +103,8 @@ export default {
       options:[],
       dialogVisible:false,
       visible:false,
-      value:''
+      value:'',
+      selection:[]
     }
   },
   components:{
@@ -339,6 +342,20 @@ export default {
         this.tool.showMessage(res)
       })
     },
+    select (data) {
+      this.selection = data
+    },
+    async adddispatch () {
+       const res = await this.$api.requested({
+        "id": "20230220100604",
+        "content": {
+          "sa_orderid":this.mainData.sa_orderid,
+          "sa_orderitemsids": this.selection.map(e=>{
+            return e.itemid
+          })
+        }
+      })
+    }
   },
   mounted () {
     this.queryMainData(this.$route.query.id)

src/HDrpManagement/orderManage/details/tabs/productlist.vue

@@ -1,7 +1,9 @@
 <template>
   <div>
-    <excel :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
-<!--    <el-button type="primary" plain size="small" @click="export1" >导出</el-button>-->
+    <div class="flex-align-center">
+      <excel class="inline-16" :tablecols="columnTitle" :param="param" :total="total" :excelTitle="excelTitle"></excel>
+      <slot name="operation"></slot>
+    </div>
     <el-table
       ref="multipleTable"
       :data="tableData"
@@ -9,12 +11,13 @@
       style="width: 100%;"
       size="small"
       stripe
-      border>
-      <!-- <el-table-column
+      border
+      @selection-change	="selectionChange">
+      <el-table-column
         type="selection"
         width="55"
         align="center">
-      </el-table-column> -->
+      </el-table-column>
       <el-table-column
         prop="itemname"
         label="产品名称"
@@ -353,6 +356,9 @@ export default {
         },
       })
     },
+    selectionChange (selection) {
+      this.$emit('select',data)
+    }
   },
   mounted () {
     this.listData()

src/HDrpManagement/toolBorrowingMag/detail/tabs/toolList.vue

@@ -29,7 +29,7 @@
         label="数量"
         width="180">
         <template slot-scope="scope">
-          <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+          <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit' && !data.sa_contractid" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
           <span v-else>{{scope.row.qty}}</span>
         </template>
       </el-table-column>

src/HDrpManagement/toolBorrowingMag/index.vue

@@ -9,7 +9,7 @@
       tableName="toolBorrowingTable" 
       idName="sa_orderid" 
       :apiId="{query:20230114105002,del:20230116100002}"
-      :autoQuery="false"
+      :autoQuery="true"
       :detailPath="{
         path:'/toolBorrowingMagDetail'
       }">
@@ -30,7 +30,6 @@
 </template>
 
 <script>
-import { log } from '@antv/g2plot/lib/utils'
 /**
  * @basicLayout 提供this.$ref['basicLayout'].listData()方法查询列表信息
  * @param {string} formPath 新建,编辑组件所在文件夹名称,以后所有列表新增修改文件统一放入Form文件夹下面,并创建与开发应用相同的名称的子文件夹

src/HDrpManagement/toolBorrowingMag/modules/add.vue

@@ -1,23 +1,23 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="handleCommand">新 建</el-button>
-    <el-drawer
+    <el-dialog
       title="新建借用单"
       :visible.sync="drawer"
       direction="rtl"
       :show-close="false"
       append-to-body
-      size="800px"
+      width="400px"
       @close="refresh">
-      <div class="drawer__panel">
+      <div>
         <el-row :gutter="15">
           <el-form size="small" ref="form" :model="form" :rules="rules" label-width="100px" :status-icon="false">
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="企业信息" prop="sys_enterpriseid">
-                <enterprise @rowClick="rowClick"></enterprise>
+                <enterprise @rowClick="rowClick" ref="enterprise"></enterprise>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="工具合同">
                 <el-popover
                   placement="bottom"
@@ -28,46 +28,14 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="form.type === '特殊订单'" :span="12">
-              <el-form-item label="子分类" prop="typemx">
-                <el-select v-model="form.typemx" placeholder="请选择选子分类" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in typemxlist" :key="index" :label="item.value"
-                    :value="item.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col :span="12" v-if="!form.sa_contractid">
-              <el-form-item label="选择品牌" prop="sa_brandid">
-                <el-select v-model="form.sa_brandid" placeholder="请选择选择品牌" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in sa_brandidOptions" :key="index" :label="item.brandname"
-                    :value="item.sa_brandid" :disabled="item.disabled"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="!form.sa_contractid">
-              <el-form-item label="选择领域" prop="tradefield">
-                <el-select v-model="form.tradefield" placeholder="请选择选择领域" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in tradefieldOptions" :key="index" :label="item.tradefield"
-                    :value="item.tradefield" @click.native="setChildField(item)"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="!form.sa_contractid">
-              <el-form-item label="领域明细">
-                <el-select v-model="form.tradefieldmx" placeholder="请选择领域明细" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in childField" :key="index" :label="item"
-                    :value="item"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
           </el-form>
         </el-row>
       </div>
-      <div class="fixed__btn__panel">
-        <el-button class="normal-btn-width" type="primary" size="small" @click="submitForm">创 建</el-button>
-        <el-button class="normal-btn-width" size="small" @click="resetForm">重 置</el-button>
-      </div>
-    </el-drawer>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="submitForm">创 建</el-button>
+        <el-button size="small" @click="refresh">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -231,7 +199,8 @@ export default {
         "billdate":"",//单据日期，默认创建日期
         "signbacknum":""
       }
-      this.visible1 = false
+      this.$refs['enterprise'].form.enterprisename = ''
+      this.drawer = false
     }
   }
 }

src/SDrpManagement/salerToolBorrowing/detail/tabs/toolList.vue

@@ -29,7 +29,7 @@
         label="数量"
         width="180">
         <template slot-scope="scope">
-          <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+          <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit' && !data.sa_contractid" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
           <span v-else>{{scope.row.qty}}</span>
         </template>
       </el-table-column>

src/SDrpManagement/salerToolBorrowing/modules/add.vue

@@ -1,23 +1,23 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="handleCommand">新 建</el-button>
-    <el-drawer
+    <el-dialog
       title="新建借用单"
       :visible.sync="drawer"
       direction="rtl"
       :show-close="false"
       append-to-body
-      size="800px"
+      width="400px"
       @close="refresh">
-      <div class="drawer__panel">
+      <div>
         <el-row :gutter="15">
           <el-form size="small" ref="form" :model="form" :rules="rules" label-width="100px" :status-icon="false">
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="企业信息" prop="sys_enterpriseid">
                 <enterprise @rowClick="rowClick"></enterprise>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="工具合同">
                 <el-popover
                   placement="bottom"
@@ -28,46 +28,14 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="form.type === '特殊订单'" :span="12">
-              <el-form-item label="子分类" prop="typemx">
-                <el-select v-model="form.typemx" placeholder="请选择选子分类" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in typemxlist" :key="index" :label="item.value"
-                    :value="item.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col :span="12" v-if="!form.sa_contractid">
-              <el-form-item label="选择品牌" prop="sa_brandid">
-                <el-select v-model="form.sa_brandid" placeholder="请选择选择品牌" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in sa_brandidOptions" :key="index" :label="item.brandname"
-                    :value="item.sa_brandid" :disabled="item.disabled"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="!form.sa_contractid">
-              <el-form-item label="选择领域" prop="tradefield">
-                <el-select v-model="form.tradefield" placeholder="请选择选择领域" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in tradefieldOptions" :key="index" :label="item.tradefield"
-                    :value="item.tradefield" @click.native="setChildField(item)"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="!form.sa_contractid">
-              <el-form-item label="领域明细">
-                <el-select v-model="form.tradefieldmx" placeholder="请选择领域明细" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in childField" :key="index" :label="item"
-                    :value="item"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
           </el-form>
         </el-row>
       </div>
-      <div class="fixed__btn__panel">
-        <el-button class="normal-btn-width" type="primary" size="small" @click="submitForm">创 建</el-button>
-        <el-button class="normal-btn-width" size="small" @click="resetForm">重 置</el-button>
-      </div>
-    </el-drawer>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="submitForm">创 建</el-button>
+        <el-button size="small" @click="refresh">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -235,7 +203,8 @@ export default {
         "billdate":"",//单据日期，默认创建日期
         "signbacknum":""
       }
-      this.visible1 = false
+      // this.$refs['enterprise'].form.enterprisename = ''
+      this.drawer = false
     }
   }
 }

src/SDrpManagement/salerToolBorrowing/modules/edit.vue

@@ -12,21 +12,31 @@
       </div>
     </div>
     <div class="drawer__panel">
-      <div v-if="data.sa_contractid" class="normal-margin">
-        <p class="normal-title mt-10">合同信息</p>
-        <div class="reveive__panel">
-          <p>{{data.contract_title}}</p>
+      <div class="flex-align-center">
+        <div v-if="data.sa_contractid" class="normal-margin">
+          <p class="normal-title mt-10">合同信息</p>
+          <div class="reveive__panel">
+            <p>{{data.contract_title}}</p>
+          </div>
+        </div>
+        <div class="normal-margin">
+          <p class="normal-title mt-10">单据日期</p>
+          <div class="reveive__panel">
+            <el-date-picker
+              v-model="defaultData.billdate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+              size="mini">
+            </el-date-picker>
+          </div>
+        </div>
+        <div v-if="data.sa_contractid" class="normal-margin">
+          <p class="normal-title mt-10">购买套数</p>
+          <div class="reveive__panel">
+            <el-input-number v-model="defaultData.toolcount" size="mini" label="购买套数"></el-input-number>
+          </div>
         </div>
-      </div>
-      <div class="normal-margin">
-        <p class="normal-title mt-10">单据日期</p>
-        <el-date-picker
-          v-model="defaultData.billdate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择日期"
-          size="mini">
-        </el-date-picker>
       </div>
       <div class="flex-align-center normal-margin">
         <div style="flex:1;margin-right:10px">
@@ -74,7 +84,7 @@
             <small>{{defaultData.re_info.province}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:'--'}}</small>
           </div>
         </div>
-        <div style="flex:1">
+        <!-- <div style="flex:1">
           <div class="mt-10">
             <p class="normal-title inline-16">选择账户</p>
             <el-popover
@@ -114,7 +124,7 @@
             <p><b>¥{{tool.formatAmount(defaultData.accountclass.balance,2)}}</b></p>
             <small>{{defaultData.accountclass.accountname}}</small>
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="mt-10">
         <p class="normal-title inline-16">选择财务信息</p>
@@ -178,10 +188,6 @@
       <div class="mt-10">
         <el-input v-model="defaultData.remarks" type="textarea" :autosize="{minRows:5,maxRows:10}" placeholder="请输入订单备注"></el-input>
       </div>
-      <div v-if="data.sa_contractid" class="normal-margin">
-        <p class="normal-title mt-10">购买套数</p>
-        <el-input-number v-model="defaultData.toolcount" label="购买套数"></el-input-number>
-      </div>
       <div>
         <div class="mt-10">
           <p class="normal-title inline-16">订单产品</p>

src/SDrpManagement/toolBorrowing/detail/tabs/toolList.vue

@@ -29,7 +29,7 @@
         label="数量"
         width="180">
         <template slot-scope="scope">
-          <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit'" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
+          <el-input-number :controls="true" controls-position='right' :step-strictly="true" v-if="type === 'edit' && !data.sa_contractid" size="mini" v-model="scope.row.qty" :min="scope.row.orderminqty" :step="scope.row.orderaddqty" label="输入数量" @change="rowChange(scope.row,scope.$index)"></el-input-number>
           <span v-else>{{scope.row.qty}}</span>
         </template>
       </el-table-column>

src/SDrpManagement/toolBorrowing/modules/add.vue

@@ -1,23 +1,18 @@
 <template>
   <div>
     <el-button type="primary" size="small" @click="handleCommand">新 建</el-button>
-    <el-drawer
+    <el-dialog
       title="新建借用单"
       :visible.sync="drawer"
       direction="rtl"
       :show-close="false"
       append-to-body
-      size="800px"
+      width="400px"
       @close="refresh">
-      <div class="drawer__panel">
+      <div>
         <el-row :gutter="15">
           <el-form size="small" ref="form" :model="form" :rules="rules" label-width="100px" :status-icon="false">
-            <!-- <el-col :span="12">
-              <el-form-item label="企业信息" prop="sys_enterpriseid">
-                <enterprise @rowClick="rowClick"></enterprise>
-              </el-form-item>
-            </el-col> -->
-            <el-col :span="12">
+            <el-col :span="24">
               <el-form-item label="工具合同">
                 <el-popover
                   placement="bottom"
@@ -28,46 +23,14 @@
                 </el-popover>
               </el-form-item>
             </el-col>
-            <!-- <el-col v-if="form.type === '特殊订单'" :span="12">
-              <el-form-item label="子分类" prop="typemx">
-                <el-select v-model="form.typemx" placeholder="请选择选子分类" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in typemxlist" :key="index" :label="item.value"
-                    :value="item.value"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col> -->
-            <el-col :span="12" v-if="!form.sa_contractid">
-              <el-form-item label="选择品牌" prop="sa_brandid">
-                <el-select v-model="form.sa_brandid" placeholder="请选择选择品牌" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in sa_brandidOptions" :key="index" :label="item.brandname"
-                    :value="item.sa_brandid" :disabled="item.disabled"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="!form.sa_contractid">
-              <el-form-item label="选择领域" prop="tradefield">
-                <el-select v-model="form.tradefield" placeholder="请选择选择领域" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in tradefieldOptions" :key="index" :label="item.tradefield"
-                    :value="item.tradefield" @click.native="setChildField(item)"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="12" v-if="!form.sa_contractid">
-              <el-form-item label="领域明细">
-                <el-select v-model="form.tradefieldmx" placeholder="请选择领域明细" clearable :style="{width: '100%'}">
-                  <el-option v-for="(item, index) in childField" :key="index" :label="item"
-                    :value="item"></el-option>
-                </el-select>
-              </el-form-item>
-            </el-col>
           </el-form>
         </el-row>
       </div>
-      <div class="fixed__btn__panel">
-        <el-button class="normal-btn-width" type="primary" size="small" @click="submitForm">创 建</el-button>
-        <el-button class="normal-btn-width" size="small" @click="resetForm">重 置</el-button>
-      </div>
-    </el-drawer>
+      <span slot="footer" class="dialog-footer">
+        <el-button type="primary" size="small" @click="submitForm">创 建</el-button>
+        <el-button size="small" @click="refresh">取 消</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -235,7 +198,8 @@ export default {
         "billdate":"",//单据日期，默认创建日期
         "signbacknum":""
       }
-      this.visible1 = false
+      this.$refs['enterprise'].form.enterprisename = ''
+      this.drawer = false
     }
   }
 }

src/SDrpManagement/toolBorrowing/modules/edit.vue

@@ -12,21 +12,31 @@
       </div>
     </div>
     <div class="drawer__panel">
-      <div v-if="data.sa_contractid" class="normal-margin">
-        <p class="normal-title mt-10">合同信息</p>
-        <div class="reveive__panel">
-          <p>{{data.contract_title}}</p>
+      <div class="flex-align-center">
+        <div v-if="data.sa_contractid" class="normal-margin">
+          <p class="normal-title mt-10">合同信息</p>
+          <div class="reveive__panel">
+            <p>{{data.contract_title}}</p>
+          </div>
+        </div>
+        <div class="normal-margin">
+          <p class="normal-title mt-10">单据日期</p>
+          <div class="reveive__panel">
+            <el-date-picker
+              v-model="defaultData.billdate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              placeholder="选择日期"
+              size="mini">
+            </el-date-picker>
+          </div>
+        </div>
+        <div v-if="data.sa_contractid" class="normal-margin">
+          <p class="normal-title mt-10">购买套数</p>
+          <div class="reveive__panel">
+            <el-input-number v-model="defaultData.toolcount" size="mini" label="购买套数"></el-input-number>
+          </div>
         </div>
-      </div>
-      <div class="normal-margin">
-        <p class="normal-title mt-10">单据日期</p>
-        <el-date-picker
-          v-model="defaultData.billdate"
-          type="date"
-          value-format="yyyy-MM-dd"
-          placeholder="选择日期"
-          size="mini">
-        </el-date-picker>
       </div>
       <div class="flex-align-center normal-margin">
         <div style="flex:1;margin-right:10px">
@@ -74,7 +84,7 @@
             <small>{{defaultData.re_info.province}}{{defaultData.re_info.city}}{{defaultData.re_info.county}}{{defaultData.re_info.address?defaultData.re_info.address:'--'}}</small>
           </div>
         </div>
-        <div style="flex:1">
+        <!-- <div style="flex:1">
           <div class="mt-10">
             <p class="normal-title inline-16">选择账户</p>
             <el-popover
@@ -114,7 +124,7 @@
             <p><b>¥{{tool.formatAmount(defaultData.accountclass.balance,2)}}</b></p>
             <small>{{defaultData.accountclass.accountname}}</small>
           </div>
-        </div>
+        </div> -->
       </div>
       <div class="mt-10">
         <p class="normal-title inline-16">选择财务信息</p>
@@ -178,10 +188,10 @@
       <div class="mt-10">
         <el-input v-model="defaultData.remarks" type="textarea" :autosize="{minRows:5,maxRows:10}" placeholder="请输入订单备注"></el-input>
       </div>
-      <div v-if="data.sa_contractid" class="normal-margin">
+      <!-- <div v-if="data.sa_contractid" class="normal-margin">
         <p class="normal-title mt-10">购买套数</p>
         <el-input-number v-model="defaultData.toolcount" label="购买套数"></el-input-number>
-      </div>
+      </div> -->
       <div>
         <div class="mt-10">
           <p class="normal-title inline-16">订单产品</p>