9
0

2 Commits 35d0896ca7 ... b692316907

Autor SHA1 Mensagem Data
  zouzhd b692316907 页面修改 há 3 anos atrás
  zouzhd 13248af1f0 拉取 há 3 anos atrás

+ 2 - 5
build/utils.js

@@ -15,11 +15,8 @@ const devPathSrc = path.resolve(__dirname, '../../../src'); // node_modules应
 // ['index','appoint','configManager','homepage',''inward,'queue','RMS','sale','serviceManager','SporadicManage'
 //       统计报表       组织机构/系统管理 采购  仓储
 //  'statisticalReport','systemConfig','TMS','WMS','workFlow']
-
- let devModules = ['all']
-//  let devModules = ['index','WMS']
-// let devModules = ['index','SporadicManage','TMS','statisticalReport','RMS'];
-
+let devModules = ['all']
+// let devModules = ['index','TMS','statisticalReport','RMS','sale','appoint','inward'];
 // let devModules = ['index','appoint','WMS'];
 
 if (pathSrc.indexOf('node_modules') > -1) {

+ 1 - 1
config/index.js

@@ -65,7 +65,7 @@ let proxyTable = {
   // 所有数据的请求域名地址
   "/api/v1": {
     target: "http://172.16.33.166:8080",
-    // target: "http://localhost:8019",
+    // target: "http://192.168.1.107:8019",
     ws: true,
     pathRewrite: {
       "^/api/v1": "/api/v1"

+ 1 - 1
src/views/appoint/components/saleContract/addSaleOrderCoproductSend.vue

@@ -755,7 +755,7 @@ export default {
     },
     //点击取消按钮的事件
     cancel(){
-      this.$router.push('/saleOrder')
+      this.$router.push('/saleOrderCoproduct')
     },
     //点击删除按钮删除当前点击的对象
     deleteRow(index){

+ 4 - 0
src/views/inward/components/truckOrder/addPurInwardOrder.vue

@@ -151,6 +151,7 @@
         <!-- 查询所有的车辆 -->
         <dilTable
           v-bind.sync="truck"
+          :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang"
           @selection-change="currentRadioChange1"
         ></dilTable>
       </div>
@@ -169,6 +170,9 @@ export default {
   components: { PageTitle },
   data() {
     return {
+      shiyHeigth:140,
+      isHeigth:true,
+      isKuang:false,
       planId : null ,
       disabled:false,
       //线路名称

+ 48 - 1
src/views/inward/components/truckOrder/decomposePlan.vue

@@ -58,7 +58,7 @@
       </el-button>
    <dilTable v-bind.sync="zero" @radio-change="currentRadioChange1" ></dilTable>    
     </el-drawer>
-    <el-drawer
+    <!-- <el-drawer
       :visible.sync="drawer"
       :direction="direction"
       :before-close="handleClose"
@@ -72,7 +72,51 @@
         <i class="el-icon-plus"></i>确认
       </el-button>
    <dilTable v-bind.sync="second" @selection-change="currentRadioChange" ></dilTable>    
+    </el-drawer> -->
+
+    <el-drawer 
+      :visible.sync="drawer" 
+      :with-header="false"
+      :destroy-on-close="true"
+      direction="rtl"
+      size="40%"
+      :show-close="true"
+      :wrapperClosable="false"
+      close-on-press-escape
+    >
+      <el-input
+        placeholder="请输入内容"
+        v-model="truckText"
+        style="margin-top: 10px; margin-left: 20px; width: 250px"
+        clearable
+      >
+      </el-input>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onclick"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-search"></i>查询
+      </el-button>
+      <el-button
+        type="primary"
+        class="btn"
+        @click="onConfirm"
+        style="margin-left: 5px"
+      >
+        <i class="el-icon-check"></i>确定
+      </el-button>
+      <div class="tablecls">
+        <!-- 查询所有的车辆 -->
+        <dilTable
+          v-bind.sync="second"
+          :isHeigth="isHeigth" :shiyHeigth="shiyHeigth" :isKuang="isKuang"
+          @selection-change="currentRadioChange"
+        ></dilTable>
+      </div>
     </el-drawer>
+
 		<vxe-table v-model="tableData" keep-source border resizable show-overflow show-footer ref="xTable"
 			max-height="400" :footer-method="footerMethod" :data="tableData"
 			:edit-config="{trigger: 'click', mode: 'cell', showStatus: true}"
@@ -140,6 +184,9 @@ export default {
   },
   data() {
     return {
+      shiyHeigth:140,
+      isHeigth:true,
+      isKuang:false,
       lineId:null,
       requirementId:null,
       capacityNumber:null,