Home Explore Help
Register Sign In
usoft
/
platform-b2b
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

更新新增物料和物料详情UI

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@7568 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d
hejq 9 years ago
parent
fe3d78fe2b
commit
76402fc26f
6 changed files with 269 additions and 400 deletions
Unified View Show Diff Stats
  1. 12 0
      src/main/webapp/resources/tpl/index/baseInfo/modal/Component_KindChoose_modal.html
  2. 147 181
      src/main/webapp/resources/tpl/index/baseInfo/newProdInfo.html
  3. 108 216
      src/main/webapp/resources/tpl/index/baseInfo/productDetail.html
  4. 1 1
      src/main/webapp/resources/tpl/index/home/left.html
  5. 0 1
      src/main/webapp/resources/tpl/index/home/right.html
  6. 1 1
      src/main/webapp/resources/tpl/index/purc/addOrder.html

+ 12 - 0
src/main/webapp/resources/tpl/index/baseInfo/modal/Component_KindChoose_modal.html
View File 

@@ -1,3 +1,15 @@
 
+<style>

+.headerline .content {

+	width: 100px;

+	font-size: 14px;

+}

+.modal-body {

+	min-height: 350px;

+}

+.modal {

+ 	top: 70px;

+}

+</style>

 <div class="modal-body" style="min-height: 500px;">

 <div class="modal-body" style="min-height: 500px;">

 	<div class="headerline">

 	<div class="headerline">

 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>器件选择</span>

 		<span class="content"><i class="fa fa-fw fa-edit text-primary"></i>器件选择</span>

+ 147 - 181
src/main/webapp/resources/tpl/index/baseInfo/newProdInfo.html
View File 

@@ -1,188 +1,140 @@
 
+<!DOCTYPE html>

+<html lang="en">

+<head>

+	<meta charset="UTF-8"/>

+	<title>产品资料新增</title>

+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>

+	<meta name="Keywords" content=""/>

+	<meta name="Description" content=""/>

+	<link rel="stylesheet" href="static/css/add.css "/>

+</head>

+<body>

 <style>

 <style>

-.new {

-	padding: 0px 20px 20px 20px;

+.productSpec textarea {

+	width: 276.656px;

+	height: auto;

 }

 }

 

 

-.new label {

-	font-size: 14px;

-	font-weight: normal;

-	font-family: "Microsoft YaHei" ! important;

+#image-box .x-floating-wrap {

+	position: fixed;

+	z-index: 99998;

+	background: #000;

+	top: 0;

+	left: 0;

+	width: 100%;

+	height: 100%;

+	opacity: 0.5;

 }

 }

-

-.headerline {

-	font-size: 14px;

-  	font-family: Microsoft YaHei,SimHei,Verdana;

-  	font-weight: 500;

-  	line-height: 22px;

-  	margin: 25px 0;

-  	clear: both;

-  	zoom: 1;

-  	border-top: 1px solid #eee;

-  	position: relative;

+#image-box .x-floating {

+	position: fixed;

+	z-index: 99999;

+	top: 60px;

+	left: 0;

+	width: 100%;

+	height: 100%;

+	text-align: center;

+	vertical-align: middle;

 }

 }

-

-.headerline .content {

-	position: absolute;

-	top: 12px;

-	left: 20px;

-	line-height: 24px;

-  	padding: 0 15px 0 10px;

-  	background: #fff;

-  	z-index: 2;

+#image-box .x-floating img {

+	margin: auto auto;

+	max-width: 100%;

+	max-height: 80%;

+	-webkit-user-select: none;

+	-moz-user-select: none;

+	-ms-user-select: none;

+	user-select: none

 }

 }

 

 

-.headerline .end {

-	position: absolute;

-	top: 12px;

-	right: 20px;

-	line-height: 24px;

-  	padding-left: 15px;

-  	background: #fff;

-  	z-index: 2;

+#image-box .x-close-wrap {

+	position: fixed;

+	top: 0;

+	right: 0;

+	z-index: 100000;

+	width: 120px;

+  	height: 120px;

+	margin: -60px -60px 0 0;

+	border-radius: 100%;

+	background: #000;

+	opacity: .3

 }

 }

 

 

-.input-group-addon {

-	background-color: inherit;

-  	border: 1px solid #e1e1e1;

-  	color: #888 !important;

-}

-

-.status {

+#image-box .x-close-wrap a {

 	position: absolute;

 	position: absolute;

-  	height: 50px;

-  	width: 100px;

-  	/* border-radius: 50px; */

-  	border: dashed 2px #999;

-  	border-radius: 13px;

-  	padding-top: 7px;

-  	padding-left: 5px;

-  	text-align: center;

-  	right: 83px;

-  	top: 10px;

-  	background-color: #FFFFFF;

-  	color: #999;

-  	word-spacing: 8px;

-  	letter-spacing: 5px;

-  	-webkit-transform: rotate(15deg);

-  	-moz-transform: rotate(15deg);

-  	-o-transform: rotate(15deg);

-  	transform: rotate(14deg);

-  	font-size: 20px;

-  	z-index: 9;

-  	font-family: '楷体', '微软雅黑';

+	left: 25px;

+	bottom: 25px;

+	font-size: 42px;

+	color: #fff

 }

 }

 

 

-.productSpec textarea {

-	width: 276.656px;

-	height: auto;

-	padding-bottom: 50px;

+#image-box .x-close-wrap:hover {

+	opacity: .7

 }

 }

-.new{

-		position: relative;

-		top: -23px;

-	}

 </style>

 </style>

-<div class="loading" ng-class="{'in': loading}">

-	<i></i>

-</div>

-<div class="block new">

-	<form class="form-horizontal" name="productInfo">

-		<div class="headerline">

-			<div class="content">新增物料</div>

-			<div class="end">

-				<i class="fa fa-angle-down"></i>&nbsp;&nbsp;

-			</div>

-		</div>

-		<div class="form-group form-group-sm has-feedback">

-	<!-- 		<div class="col-sm-2"></div>

-			<div class="from-group col-sm-3">

-				<button class="btn btn-success btn-sm" ng-click="selectKind()" style="width: 100%;">选择类目</button>

-			</div> -->

-		</div>

-		<div class="headerline">

-			<div class="form-group form-group-sm has-feedback">

-				<label for="customerUser" class="col-sm-2 control-label"></label>

-				<div class="col-sm-4">

-					<div class="">

-					</div>

-				</div>

-			</div>

-			<div class="form-group form-group-sm has-feedback">

-				<label for="customerUser" class="col-sm-2 control-label">原厂型号</label>

-				<div class="col-sm-4">

-					<div class="">

-						<input ng-model="prodInfo.cmpCode" type="text" readonly="readonly" class="form-control input-dbfind" id="custUser" 

-							placeholder="点击选择原厂型号" style="cursor: pointer;" ng-click="selectKind()">

-						<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>

-					</div>

-				</div>

-			</div>

-			<div class="form-group form-group-sm has-feedback">

-				<label for="customerUser" class="col-sm-2 control-label">标准料号</label>

-				<div class="col-sm-4">

-					<div class="">

-						<input ng-model="prodInfo.cmpUuId" type="text" class="form-control input-dbfind" id="custUser" 

-							placeholder="标准料号" style="cursor: pointer;" readonly="readonly">

-						<span class="form-control-feedback text-simple"></span>

-					</div>

-				</div>

-			</div>

-			<div class="form-group form-group-sm has-feedback">

-				<label for="customerUser" class="col-sm-2 control-label">物料品牌</label>

-				<div class="col-sm-4">

-					<div class="">

-						<input ng-model="prodInfo.brand" type="text" class="form-control input-dbfind" id="custUser" 

-							placeholder="物料品牌" style="cursor: pointer;" readonly="readonly">

-						<span class="form-control-feedback text-simple"></span>

-					</div>

-				</div>

-			</div>

-			<div class="form-group form-group-sm has-feedback">

-				<label for="name" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料名称</label>

-				<div class="col-sm-4">

-					<div class="">

-						<input ng-model="prodInfo.title" type="text" class="form-control" id="customer" 

-							placeholder="物料名称" style="cursor: pointer;" ng-click="dbfindCust()" required="true">

-						<span class="form-control-feedback text-simple"><!-- <i class="fa fa-search"></i> --></span>

-					</div>

-				</div>

-			</div>

-			<div class="form-group form-group-sm has-feedback">

-				<label for="code" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料编号</label>

-				<div class="col-sm-4">

-					<div class="">

-						<input ng-model="prodInfo.code" type="text" class="form-control input-dbfind" id="custUser" 

-							placeholder="物料编号"  style="cursor: pointer;" required="true">

-						<span class="form-control-feedback text-simple"></span>

-					</div>

-				</div>

-			</div>

-			<div class="form-group form-group-sm has-feedback">

-				<label for="spec" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料规格</label>

-				<div class="col-sm-4">

-					<div class="productSpec">

-						<textarea ng-model="prodInfo.spec" type="text"  id="product"  class="input-dbfind"

-							placeholder="物料规格" style="cursor: pointer;"

-							ng-click="dbfindCustProd()" required="true"></textarea>

-					</div>

-				</div>

-			</div>

-			<div class="form-group form-group-sm has-feedback">

-				<label for="unit" class="col-sm-2 control-label">单位</label>

-				<div class="col-sm-4">

-					<div class="">

-						<input ng-model="prodInfo.unit" type="text" class="form-control input-dbfind" id="custUser" 

-							placeholder="单位" style="cursor: pointer;" required="true">

-					</div>

-				</div>

-			</div>

-			<div class="form-group form-group-sm has-feedback">

-				<label for="file" class="col-sm-2 control-label">附件</label>

-				<div class="col-sm-4">

-					<div class="">

-						<input ng-file-select  ng-model="myFiles" type="file" 

-			      		ng-multiple="false" class="form-control" id="enImage" name="enImage" placeholder="图片或PDF文件">

-				      	<div class="well margin-b-0" >

+<div class="wrap">

+	<div class="content">

+		<div class="com_title">服务>销售模块<font>>产品资料</font></div>

+		<div class="com_head"><span>产品资料</span><span class="fr"><em>录入人：{{user.userName}}</em><time>日期：{{time}}</time></span></div>

+		<!--产品资料新增-->

+        <form class="pro-add-tab pro-add-data clearfix" name="productInfo">

+            <div class="com_title01 sty01"><span>基本信息<em>*</em></span></div>

+            <dl>

+                <dd>

+                    <div class="fl">原厂型号：</div>

+                    <div class="fr"><input type="text" readonly="readonly" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode"  ng-click="selectKind()"><span>（关联器件原厂型号，不可编辑）</span></div>

+                </dd>

+                <dd>

+                    <div class="fl">标准料号：</div>

+                    <div class="fr"><input type="text" ng-model="prodInfo.cmpUuId" placeholder="标准料号" style="cursor: pointer;" readonly="readonly"><span>（关联器件标准料号，不可编辑）</span></div>

+                </dd>

+                <dd>

+                    <div class="fl">产品品牌：</div>

+                    <div class="fr"><input type="text" g-model="prodInfo.brand" type="text" placeholder="产品品牌" style="cursor: pointer;" readonly="readonly"><span>（关联器件物料品牌，不可编辑）</span></div>

+                </dd>

+                <dd>

+                    <div class="fl">产品编号：</div>

+                    <div class="fr"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true"><span>（建议与您系的产品编号保持一致，便于追溯）</span></div>

+                </dd>

+                <dd>

+                    <div class="fl">产品名称：</div>

+                    <div class="fr"><input type="text"  ng-model="prodInfo.title" style="cursor: pointer;" required="true"></div>

+                </dd>

+                <dd>

+                    <div class="fl">产品规格：</div>

+                    <div class="fr"><input type="text"  ng-model="prodInfo.spec" style="cursor: pointer;" required="true"><span>（请填写详细）</span></div>

+                </dd>

+                <dd>

+                    <div class="fl">单位：</div>

+                    <div class="fr"><input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;"><span>（请填写详细）</span></div>

+                    <!-- <div class="fr">

+                        <select name="" id="">

+                            <option value="1">kg</option>

+                            <option value="2">g</option>

+                        </select>

+                    </div> -->

+                </dd>

+                <!-- <dd>

+                    <div class="fl">最小包装量： </div>

+                    <div class="fr"><input type="text" value="1212122"></div>

+                </dd>

+                <dd>

+                    <div class="fl">最小订货量：</div>

+                    <div class="fr"><input type="text" value="12130"></div>

+                </dd>

+                <dd>

+                    <div class="fl">采购周期：</div>

+                    <div class="fr"><input type="text" value="10天"></div>

+                </dd> -->

+            </dl>

+            <div class="com_title01"><span>图片和详细说明</span></div>

+            <dl>

+                <dd class="upload-pro">

+                    <div class="fl">产品图片：</div>

+                    <div class="fr">

+                        <!-- <span><input type="file" onchange="proText.value=this.value" ng-model="myFiles" placeholder="图片或PDF文件" ng-multiple="false"></span> -->

+                        <span><input ng-file-select  ng-model="myFiles" type="file" ng-multiple="false" id="enImage" name="enImage" placeholder="图片或PDF文件"></span>

+                       <!--  <input type="text" id="proText"> -->

+                        <i>提示：图片尺寸在750*750像素以上，图片请避免全文字</i>

+                        <div class="well margin-b-0" >

 				      		<div ng-show="previewShow">

 				      		<div ng-show="previewShow">

 				      			<img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">

 				      			<img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">

 				      			<div>

 				      			<div>

@@ -197,15 +149,29 @@
 
 				      			<span class="text-warning">请上传清晰照片的图片文件或PDF文件</span>

 				      			<span class="text-warning">请上传清晰照片的图片文件或PDF文件</span>

 				      		</div>

 				      		</div>

 				      	</div>

 				      	</div>

-					</div>

-				</div>

-			</div>

-		</div>

-	</form>

-	<div class="form-group form-group-sm">

-		<div class="col-sm-2"></div>

-		<div class="col-sm-3">

-			<button class="btn btn-success btn-sm" style="width: 100%;" ng-click="submit(prodInfo)" ng-disabled="productInfo.$invalid">提交</button>

-		</div>

+                    </div>

+                </dd>

+              <!--   <dd class="text-detail">

+                    <div class="fl">详细描述：</div>

+                    <div class="fr">

+                       <textarea placeholder="请输入产品详细描述"></textarea>

+                    </div>

+                </dd>

+                <dd>

+                    <div class="fl">产品规格：</div>

+                    <div class="fr">

+                        <span class="fj-file">

+                            <i></i><input type="text" value="上传附件" id="upload_text">

+                            <input type="file" onchange="upload_text.value=this.value" class="file01"/>

+                        </span>

+                    </div>

+                </dd> -->

+            </dl>

+            <div class="many-file-btn">

+                <button class="btn01" ng-click="submit(prodInfo)" ng-disabled="productInfo.$invalid">保存</button><a ui-sref="sale.uploadByBatch"  class="btn02">批量导入</a>

+            </div>

+        </form>

 	</div>

 	</div>

 </div>

 </div>

+</body>

+</html>

+ 108 - 216
src/main/webapp/resources/tpl/index/baseInfo/productDetail.html
View File 

@@ -1,77 +1,15 @@
 
+<!DOCTYPE html>

+<html lang="en">

+<head>

+	<meta charset="UTF-8"/>

+	<title>产品资料新增</title>

+	<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/>

+	<meta name="Keywords" content=""/>

+	<meta name="Description" content=""/>

+	<link rel="stylesheet" href="static/css/add.css "/>

+</head>

+<body>

 <style>

 <style>

-.new {

-	padding: 0px 20px 20px 20px;

-}

-

-.new label {

-	font-size: 14px;

-	font-weight: normal;

-	font-family: "Microsoft YaHei" ! important;

-}

-

-.headerline {

-	font-size: 14px;

-  	font-family: Microsoft YaHei,SimHei,Verdana;

-  	font-weight: 500;

-  	line-height: 22px;

-  	margin: 25px 0;

-  	clear: both;

-  	zoom: 1;

-  	border-top: 1px solid #eee;

-  	position: relative;

-}

-

-.headerline .content {

-	position: absolute;

-	top: 12px;

-	left: 20px;

-	line-height: 24px;

-  	padding: 0 15px 0 10px;

-  	background: #fff;

-  	z-index: 2;

-}

-

-.headerline .end {

-	position: absolute;

-	top: 12px;

-	right: 20px;

-	line-height: 24px;

-  	padding-left: 15px;

-  	background: #fff;

-  	z-index: 2;

-}

-

-.input-group-addon {

-	background-color: inherit;

-  	border: 1px solid #e1e1e1;

-  	color: #888 !important;

-}

-

-.status {

-	position: absolute;

-  	height: 50px;

-  	width: 100px;

-  	/* border-radius: 50px; */

-  	border: dashed 2px #999;

-  	border-radius: 13px;

-  	padding-top: 7px;

-  	padding-left: 5px;

-  	text-align: center;

-  	right: 83px;

-  	top: 10px;

-  	background-color: #FFFFFF;

-  	color: #999;

-  	word-spacing: 8px;

-  	letter-spacing: 5px;

-  	-webkit-transform: rotate(15deg);

-  	-moz-transform: rotate(15deg);

-  	-o-transform: rotate(15deg);

-  	transform: rotate(14deg);

-  	font-size: 20px;

-  	z-index: 9;

-  	font-family: '楷体', '微软雅黑';

-}

-

 .productSpec textarea {

 .productSpec textarea {

 	width: 276.656px;

 	width: 276.656px;

 	height: auto;

 	height: auto;

@@ -132,150 +70,104 @@
 
 	opacity: .7

 	opacity: .7

 }

 }

 </style>

 </style>

-<div class="loading" ng-class="{'in': loading}">

-	<i></i>

-</div>

-<div class="block new">

-	<form class="form-horizontal" name="productInfo">

-		<div class="headerline">

-			<div class="content">物料详情</div>

-			<div class="end">

-				<i class="fa fa-angle-down"></i>&nbsp;&nbsp;

-			</div>

-		</div>

-		<div class="headerline">

-		<div class="form-group form-group-sm has-feedback">

-			<label for="customerUser" class="col-sm-2 control-label"></label>

-			<div class="col-sm-4">

-				<div class="">

+<div class="wrap">

+	<div class="content">

+		<div class="com_title">服务>销售模块<font>>产品资料</font></div>

+		<div class="com_head"><span>产品资料</span><span class="fr"><em>录入人：{{user.userName}}</em><time>日期：{{time}}</time></span></div>

+		<!--产品资料新增-->

+        <div class="pro-add-tab pro-add-data clearfix">

+            <div class="com_title01 sty01"><span>基本信息<em>*</em></span></div>

+            <dl>

+            	<dd>

+                    <div class="fl">原厂型号：</div>

+                    <div class="fr"><input type="text" readonly="readonly" placeholder="点击选择原厂型号" style="cursor: pointer;" ng-model="prodInfo.cmpCode" ><span></span></div>

+                </dd>

+                <dd>

+                    <div class="fl">标准料号：</div>

+                    <div class="fr"><input type="text" ng-model="prodInfo.cmpUuId" placeholder="标准料号" style="cursor: pointer;" readonly="readonly"><span></span></div>

+                </dd>

+                <dd>

+                    <div class="fl">产品品牌：</div>

+                    <div class="fr"><input type="text" g-model="prodInfo.brand" type="text" placeholder="产品品牌" style="cursor: pointer;" readonly="readonly"><span></span></div>

+                </dd>

+                <dd>

+                    <div class="fl">产品编号：</div>

+                    <div class="fr"><input type="text" ng-model="prodInfo.code" style="cursor: pointer;" required="true" ng-readonly="!prodInfo.$editing"><span>（建议与您系的产品编号保持一致，便于追溯）</span></div>

+                </dd>

+                <dd>

+                    <div class="fl">产品名称：</div>

+                    <div class="fr"><input type="text"  ng-model="prodInfo.title" style="cursor: pointer;" required="true" ng-readonly="!prodInfo.$editing"></div>

+                </dd>

+                <dd>

+                    <div class="fl">产品规格：</div>

+                    <div class="fr"><input type="text"  ng-model="prodInfo.spec" style="cursor: pointer;" required="true" ng-readonly="!prodInfo.$editing"><span>（请填写详细）</span></div>

+                </dd>

+                <dd>

+                    <div class="fl">单位：</div>

+                    <div class="fr"><input type="text"  ng-model="prodInfo.unit" placeholder="单位" style="cursor: pointer;" ng-readonly="!prodInfo.$editing"><span>（请填写详细）</span></div>

+                    <!-- <div class="fr">

+                        <select name="" id="">

+                            <option value="1">kg</option>

+                            <option value="2">g</option>

+                        </select>

+                    </div> -->

+                </dd>

+                <!-- <dd>

+                    <div class="fl">最小包装量： </div>

+                    <div class="fr"><input type="text" value="1212122"></div>

+                </dd>

+                <dd>

+                    <div class="fl">最小订货量：</div>

+                    <div class="fr"><input type="text" value="12130"></div>

+                </dd>

+                <dd>

+                    <div class="fl">采购周期：</div>

+                    <div class="fr"><input type="text" value="10天"></div>

+                </dd> -->

+            </dl>

+            <div class="com_title01"><span>图片和详细说明</span></div>

+            <dl>

+                <dd class="upload-pro">

+                    <div class="fl">产品图片：</div>

+                    <div class="fr">

+                        <span><input ng-file-select  ng-model="myFiles" type="file" ng-multiple="false" id="enImage" name="enImage" placeholder="图片或PDF文件" ng-disabled="!prodInfo.$editing"></span>

+                        <a ng-click="showImg()" ng-if="prodInfo.attach">{{prodInfo.attach.name}}</a>

+                        <i>提示：图片尺寸在750*750像素以上，图片请避免全文字</i>

+                    </div>

+                </dd>

+           <!--      <dd class="text-detail">

+                    <div class="fl">详细描述：</div>

+                    <div class="fr">

+                       <textarea placeholder="请输入产品详细描述"></textarea>

+                    </div>

+                </dd>

+                <dd>

+                    <div class="fl">产品规格：</div>

+                    <div class="fr">

+                        <span class="fj-file">

+                            <i></i><input type="text" value="上传附件" id="upload_text">

+                            <input type="file" onchange="upload_text.value=this.value" class="file01"/>

+                        </span>

+                    </div>

+                </dd> -->

+            </dl>

+            <div class="many-file-btn">

+                <button class="btn01" ng-if="!prodInfo.$editing" ng-click="update()">修改</button>

+                <button class="btn01" ng-if="prodInfo.$editing" ng-click="cancel()">取消</button>

+                <a ui-sref="sale.uploadByBatch"  class="btn02" ng-if="!prodInfo.$editing">批量导入</a>

+                <a href="#" class="btn02" ng-click="submit(prodInfo)" ng-if="prodInfo.$editing">提交</a>

+            </div>

+            <div id="image-box" style="display: none">

+				<div class="x-close-wrap" title="关闭">

+					<a href="javascript:void(0);">&times;</a>

 				</div>

 				</div>

-			</div>

-		</div>

-		<div class="form-group form-group-sm has-feedback">

-			<label for="customerUser" class="col-sm-2 control-label">物料品牌</label>

-			<div class="col-sm-4">

-				<div class="">

-					<input ng-model="prodInfo.brand" type="text" class="form-control input-dbfind" id="custUser" 

-						placeholder="物料品牌" readonly="readonly" style="cursor: pointer;">

-					<span class="form-control-feedback text-simple"><i class="fa fa-search"></i></span>

+				<div class="x-floating-wrap"></div>

+				<div class="x-floating">

+					<img />

 				</div>

 				</div>

 			</div>

 			</div>

-		</div>

-		<div class="form-group form-group-sm has-feedback">

-			<label for="customerUser" class="col-sm-2 control-label">原厂型号</label>

-			<div class="col-sm-4">

-				<div class="">

-					<input ng-model="prodInfo.cmpCode" type="text" class="form-control input-dbfind" id="custUser" 

-						placeholder="原厂型号" readonly="readonly" style="cursor: pointer;">

-				</div>

-			</div>

-		</div>

-		<div class="form-group form-group-sm has-feedback">

-			<label for="customerUser" class="col-sm-2 control-label">标准料号</label>

-			<div class="col-sm-4">

-				<div class="">

-					<input ng-model="prodInfo.cmpUuId" type="text" class="form-control input-dbfind" id="custUser" 

-						placeholder="标准料号" readonly="readonly" style="cursor: pointer;">

-				</div>

-			</div>

-		</div>

-		<div class="form-group form-group-sm has-feedback">

-			<label for="customer" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料名称</label>

-			<div class="col-sm-4">

-				<div class="">

-					<input ng-model="prodInfo.title" ng-readonly="!prodInfo.$editing" type="text" class="form-control" id="customer" 

-						placeholder="物料名称" style="cursor: pointer;" ng-click="dbfindCustProd()" ng-required="true">

-				</div>

-			</div>

-		</div>

-		<div class="form-group form-group-sm has-feedback">

-			<label for="customerUser" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料编号</label>

-			<div class="col-sm-4">

-				<div class="">

-					<input ng-model="prodInfo.code" type="text" class="form-control input-dbfind" id="custUser" 

-						placeholder="物料编号" ng-readonly="!prodInfo.$editing" style="cursor: pointer;">

-				</div>

-			</div>

-		</div>

-		<div class="form-group form-group-sm has-feedback">

-			<label for="product" class="col-sm-2 control-label"><span class="text-inverse text-bold">* </span>物料规格</label>

-			<div class="col-sm-4">

-				<div class="productSpec">

-					<textarea ng-model="prodInfo.spec" type="text"  id="product"  class="input-dbfind"

-						placeholder="物料规格" ng-readonly="!prodInfo.$editing" ng-required="true"></textarea>

-				</div>

-			</div>

-		</div>

-		<div class="form-group form-group-sm has-feedback">

-			<label for="customerUser" class="col-sm-2 control-label">单位</label>

-			<div class="col-sm-4">

-				<div class="">

-					<input ng-model="prodInfo.unit" type="text" class="form-control input-dbfind" id="custUser" 

-						placeholder="单位" ng-readonly="!prodInfo.$editing" style="cursor: pointer;">

-				</div>

-			</div>

-		</div>

-	<!-- 	<div class="form-group form-group-sm has-feedback">

-			<label for="customerUser" class="col-sm-2 control-label">应用类型</label>

-			<div class="col-sm-4">

-				<div class="">

-					<input ng-model="prodInfo.sourceApp" type="text" class="form-control input-dbfind" id="custUser" 

-						placeholder="应用" ng-readonly="!prodInfo.$editing" style="cursor: pointer;">

-				</div>

-			</div>

-		</div> -->

-		<div class="form-group form-group-sm has-feedback">

-			<label for="file" class="col-sm-2 control-label">附件</label>

-			<div class="col-sm-4">

-				<div class="">

-					<div ng-if="prodInfo.attach">

-						<!-- <a href="file/{{prodInfo.attach.id}}" class="file" target="_blank">{{prodInfo.attach.name}}</a> -->

-						<a ng-click="showImg()">{{prodInfo.attach.name}}</a>

-					</div>

-					<input ng-file-select ng-model="myFiles" type="file" 

-		      		ng-multiple="false" class="form-control" id="enImage" name="enImage" placeholder="图片或PDF文件" ng-disabled="!prodInfo.$editing">

-			      	<div class="well margin-b-0" >

-			      		<div ng-show="previewShow">

-			      			<img ng-show="previewShow" alt="营业执照复印件" src="{{imgPreview}}" width="200px" height="100px">

-			      			<div>

-				      			&nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>

-				      		</div>

-			      		</div>

-			      		<div ng-show="pdfShow">

-			      			<img ng-show="pdfShow" src="static/img/all/pdf.jpg" alt="PDF文件" width="30px" height="40px">

-				      		&nbsp;&nbsp;<span class="text-primary"><b>{{imgPreviewName}}</b></span>

-			      		</div>

-			      		<div ng-show="noneFileShow">

-			      			<span class="text-warning">请上传清晰照片的图片文件或PDF文件</span>

-			      		</div>

-			      	</div>

-				</div>

-			</div>

-		</div>

-		</div>

-		<div class="form-group form-group-sm">

-			<div class="col-sm-2"></div>

-			<div class="col-sm-3" ng-if="!prodInfo.$editing">

-				<button class="btn btn-warning btn-sm" style="width: 100%;" ng-click="update()">修改</button>

-			</div>

-			<div class="col-sm-3" ng-if="prodInfo.$editing">

-				<button class="btn btn-info btn-sm" style="width: 100%;" ng-click="cancel()">取消</button>

-			</div>

-			<!-- <div class="col-sm-3" ng-if="prodInfo.$editing">

-				<button class="btn btn-success btn-sm" style="width: 100%;" ng-disabled="quotationForm.$invalid" ng-click="save()">保存</button>

-			</div> -->

-			<div class="col-sm-3"  ng-if="prodInfo.$editing">

-				<button class="btn btn-success btn-sm" style="width: 100%;" ng-click="submit(prodInfo)">提交</button>

-			</div>

-		</div>

-		<div id="image-box" style="display: none">

-			<div class="x-close-wrap" title="关闭">

-				<a href="javascript:void(0);">&times;</a>

-			</div>

-			<div class="x-floating-wrap"></div>

-			<div class="x-floating">

-				<img />

-			</div>

-		</div>

-	</form>

+        </div>

+	</div>

 </div>

 </div>

+</body>

+</html>

+ 1 - 1
src/main/webapp/resources/tpl/index/home/left.html
View File 

@@ -22,7 +22,7 @@
 
 <div class="user">

 <div class="user">

 	<div class="user-info">

 	<div class="user-info">

 		<div class="user-image">

 		<div class="user-image">

-			<img src="static/img/all/user_empty.png" ng-click=showImageDialog()>

+			<img src="static/img/all/user_empty.png">

 			<ul class=" ">

 			<ul class=" ">

 				<li>

 				<li>

 					<li class="dropdown-submenu">

 					<li class="dropdown-submenu">

+ 0 - 1
src/main/webapp/resources/tpl/index/home/right.html
View File 

@@ -85,7 +85,6 @@
 
 										ng-class="{'text-inverse': todo.cartTodo>0}">{{todo.cartTodo ||

 										ng-class="{'text-inverse': todo.cartTodo>0}">{{todo.cartTodo ||

 											0}}</span>)

 											0}}</span>)

 								</a></li>

 								</a></li>

-								<li><a>未交货采购单</a></li>

 								<li><a>进行中的招标单</a></li>

 								<li><a>进行中的招标单</a></li>

 							</ul>

 							</ul>

 						</li>

 						</li>

+ 1 - 1
src/main/webapp/resources/tpl/index/purc/addOrder.html
View File 

@@ -68,7 +68,7 @@
 
                         <em>收货信息：</em>

                         <em>收货信息：</em>

                         <span class="fr" required="required">

                         <span class="fr" required="required">

                              <select class="select fl" ng-model="order.shipadd" required="required"

                              <select class="select fl" ng-model="order.shipadd" required="required"

-								ng-options="(ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">

+								ng-options="(ship.address + ship.addressdet + ' ' + ship.receiver + ' ' + ship.usertel) for ship in ships">

 								<option value="">请选择收货地址</option>

 								<option value="">请选择收货地址</option>

 							</select>

 							</select>

                             <a href="javascript:void(0);" class="add-address">+新增收货信息</a>

                             <a href="javascript:void(0);" class="add-address">+新增收货信息</a>