shish 2 лет назад
Родитель
Сommit
ec94f80a09
2 измененных файлов с 57 добавлено и 5 удалено
  1. 2 2
      ghs/src/views/home.vue
  2. 55 3
      ghs/src/views/in/list.vue

+ 2 - 2
ghs/src/views/home.vue

@@ -95,12 +95,12 @@ export default {
 			],
 			entryData: [
 				{
-					name: '开单 Ctrl+,',
+					name: '开单',
 					icon: 'icondingdanguanli',
 					url: '/order/add'
 				},
 				{
-					name: '采购 Ctrl+.',
+					name: '采购',
 					icon: 'icondingdanguanli',
 					url: '/in/add'
 				},

+ 55 - 3
ghs/src/views/in/list.vue

@@ -70,12 +70,39 @@
       </template>
 
       <template #slot-new-cg>
-        <el-button type="primary" size="mini" style="margin-left:50px;" @click="billing()">开单 Ctrl + ,</el-button>
-				<el-button type="primary" size="mini" style="margin-left:50px;" @click="newCg()">新增采购 Ctrl + .</el-button>
+        <el-button type="primary" size="mini" style="margin-left:50px;" @click="add()">添加供货商</el-button>
+        <el-button type="primary" size="mini" style="margin-left:50px;" @click="billing()">开单</el-button>
+				<el-button type="primary" size="mini" style="margin-left:50px;" @click="newCg()">采购</el-button>
 			</template>
 
     </x-crud>
+
     <order-detail ref="orderDetail" :orderOperate="optionData" />
+
+		<el-dialog title="添加供货商" :visible.sync="addPop" width="600px" center :close-on-click-modal="false">
+			<div>
+				<div class="accounts-list">
+					名称
+					<el-input style="width: 80%" v-model="name"></el-input>
+				</div>
+				<div class="accounts-list">
+					所在地
+					<div class="accounts-center">
+						<el-button :type="location == 0?'primary':''" @click="location=0" size="small">上游</el-button>
+						<el-button :type="location == 1?'primary':''" @click="location=1" size="small">本地</el-button>
+					</div>
+				</div>
+
+				<div class="accounts-list" style="margin-top:20px;">
+					<span></span>
+					<div class="accounts-center">
+						<el-button @click="resetAdd()">取消</el-button>
+						<el-button type="primary" @click="confirmAdd()" style="margin-left:80px;">确认</el-button>
+					</div>
+				</div>
+			</div>
+    	</el-dialog>
+
   </div>
 </template>
 
@@ -112,7 +139,10 @@ export default {
         }
       ],
       optionData: {},
-      orderData:''
+      orderData:'',
+      addPop:false,
+      name:'',
+      location:0
     };
   },
   created() {
@@ -132,6 +162,17 @@ export default {
 		}
 	},
   methods: {
+    confirmAdd(){
+
+    },
+    resetAdd(){
+      this.addPop = false
+      this.location = 0
+      this.name = ''
+    },
+    add(){
+      //this.addPop = true
+    },
     billing(){
 			let query = {}
 			this.$router.push({path:'/order/add',query})
@@ -363,4 +404,15 @@ export default {
     top: 9px;
   }
 }
+.accounts-list{
+    width: 80%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin: 0 auto;
+    padding-bottom: 20px;
+    .accounts-center{
+      width: 80%;
+    }
+  }
 </style>