添加花材

ghsApp/src/admin/item/add.vue

@@ -11,7 +11,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">花材品种</div>
-          <view style="color:red;width:450upx;height:45upx;" @click.stop="notModify">{{form.name}}</view>
+          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{form.name}}</view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -49,7 +49,7 @@
             class="tui-input"
             name="discountPrice"
             @focus="form.discountPrice=''"
-            placeholder="没有特价填0"
+            placeholder="不做特价填0"
             maxlength="50"
             type="digit"
           />

ghsApp/src/admin/item/detail.vue

@@ -1,145 +1,141 @@
 <template>
-  <div class="app-content">
+  <view class="app-content">
     <!-- 花材基本信息 -->
     <form @submit="formSubmit">
-      <div class="module-com input-line-wrap">
+      <view class="module-com input-line-wrap">
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">花材名称</div>
+          <view class="tui-title">花材名称</view>
           <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请填写名称" @input="fillName($event)" maxlength="50" type="text" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">花材品种</div>
-          <view style="color:red;width:450upx;height:45upx;" @click.stop="notModify">{{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}</view>
+          <view class="tui-title">花材品种</view>
+          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}</view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">拼音缩写</div>
+          <view class="tui-title">拼音缩写</view>
           <input v-model="form.py" placeholder-class="phcolor" class="tui-input" name="py" placeholder="请填写拼音首字母缩写" maxlength="50" type="text" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">售价</div>
+          <view class="tui-title">售价</view>
           <input v-model="form.price" placeholder-class="phcolor" class="tui-input" name="price" @focus="form.price=''" placeholder="请填写售价" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">今日特价</div>
-          <input v-model="form.discountPrice" placeholder-class="phcolor" class="tui-input" name="discountPrice" @focus="form.discountPrice=''" placeholder="没有特价填0" maxlength="50" type="digit" />
+          <view class="tui-title">今日特价</view>
+          <input v-model="form.discountPrice" placeholder-class="phcolor" class="tui-input" name="discountPrice" @focus="form.discountPrice=''" placeholder="不做特价填0" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">单支价格倍数</div>
-          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" style="width:330upx;" @focus="form.smallRatio=''"
-          maxlength="50" type="number" /><text style="color:#666666;">¥<text>{{smallPrice}}</text></text>
+          <view class="tui-title">单支价格系数</view>
+          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" placeholder="请填写" style="width:230upx;" @focus="form.smallRatio=''"
+          maxlength="50" type="number" /><text style="color:#CCCCCC;">¥<text>{{smallPrice}}</text></text>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">库存</div>
-          <input v-model="form.stock" style="width:340upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
-          <button v-if="productData.id > 0" class="admin-button-com blue small" @click="goStockDetail(productData.id)">库存明细</button>
+          <view class="tui-title">库存</view>
+          <input v-model="form.stock" style="width:260upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动明细</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :arrow="true">
-          <div class="tui-title">分类</div>
+          <view class="tui-title">分类</view>
           <picker mode="selector" :value="form.classId" :range="itemClassData" range-key="name" @change="changeItemClassFn" class="tui-input" >
             <input v-model="form.classId" name="classId" type="text" hidden />
-            <div v-if="form.classId" style="height:45upx;" >{{ itemClassSelectedData.name }}</div>
-            <div class="tui-placeholder" style="height:45upx;" v-else>请选择</div>
-          </picker>
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :arrow="true">
-          <div class="tui-title">大单位</div>
-          <picker mode="selector" :value="form.bigUnitId" :range="unitData" range-key="name" @change="changeBigUnitFn" class="tui-input" >
-            <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
-            <div v-if="form.bigUnitId">{{ bigUnitSelectedData.name }}</div>
-            <div class="tui-placeholder" style="height:45upx;" v-else>请选择</div>
-          </picker>
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :arrow="true">
-          <div class="tui-title">小单位</div>
-          <picker mode="selector" :value="form.smallUnitId" :range="unitData" range-key="name" @change="changeSmallUnitFn" class="tui-input" >
-            <input v-model="form.smallUnitId" name="smallUnitId" type="text" hidden />
-            <div v-if="form.smallUnitId">{{ smallUnitSelectedData.name }}</div>
-            <div class="tui-placeholder" v-else>请选择</div>
+            <view v-if="form.classId" style="height:45upx;" >{{ itemClassSelectedData.name }}</view>
+            <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view>
           </picker>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">散客加价</div>
+          <view class="tui-title">散客加价</view>
           <input v-model="form.skAddPrice" placeholder-class="phcolor" class="tui-input" name="skAddPrice" @focus="form.skAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">普店加价</div>
+          <view class="tui-title">普店加价</view>
           <input v-model="form.addPrice" placeholder-class="phcolor" class="tui-input" name="addPrice" @focus="form.addPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">银店加价</div>
+          <view class="tui-title">银店加价</view>
           <input v-model="form.hjAddPrice" placeholder-class="phcolor" class="tui-input" name="hjAddPrice" @focus="form.hjAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">金店加价</div>
+          <view class="tui-title">金店加价</view>
           <input v-model="form.zsAddPrice" placeholder-class="phcolor" class="tui-input" name="zsAddPrice" @focus="form.zsAddPrice=''" placeholder="请填写" maxlength="50" type="digit" />
         </tui-list-cell>
 
+        <tui-list-cell class="line-cell" :arrow="false">
+          <view class="tui-title">大单位</view>
+          <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
+          <view v-if="form.bigUnitId" @click="$msg('不可修改')" style="color:#CCCCCC;width:450upx;height:45upx;">{{ bigUnitSelectedData.name }}</view>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :arrow="false">
+          <view class="tui-title">小单位</view>
+          <input v-model="form.smallUnitId" name="smallUnitId" type="text" hidden />
+          <view v-if="form.smallUnitId" @click="$msg('不可修改')" style="color:#CCCCCC;width:450upx;height:45upx;">{{ smallUnitSelectedData.name }}</view>
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">单位比</div>
-          <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
+          <view class="tui-title">单位比</view>
+          <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="color:#CCCCCC;"
+          class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">每扎重量</div>
-          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="单位：公斤" maxlength="50" type="digit" />
+          <view class="tui-title">每扎重量</view>
+          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" @click="$msg('不可修改')" style="color:#CCCCCC;"
+          class="tui-input" name="weight" placeholder="单位：公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">库存预警值</div>
-          <input v-model="form.stockWarning" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
+          <view class="tui-title">库存预警值</view>
+          <input v-model="form.stockWarning" @focus="form.stockWarning=''" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">上架状态</div>
-          <div class="switch_bx">
+          <view class="tui-title">上架状态</view>
+          <view class="switch_bx">
             <switch :checked="form.status == 2 ? false : true" @change="statusChange" style="transform: scale(0.8,0.8)" />
             <text v-if="form.status == 1">上架</text>
             <text v-else>下架</text>
-          </div>
+          </view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">状态</div>
-          <div class="switch_bx">
+          <view class="tui-title">状态</view>
+          <view class="switch_bx">
             <switch :checked="form.delStatus == 0 ? true : false" @change="delStatusChange" style="transform: scale(0.8,0.8)" />
             <text v-if="form.delStatus == 0">启用</text>
             <text v-else>停用</text>
-          </div>
+          </view>
         </tui-list-cell>
 
-      </div>
+      </view>
 
-      <div class="module-com input-line-wrap goods-wrap">
-        <div class="module-tit">
+      <view class="module-com input-line-wrap goods-wrap">
+        <view class="module-tit">
           <span>花材图片</span>
           <span class="app-color-3">（建议比例 600X600）</span>
-        </div>
+        </view>
         <view class="module-det">
           <htz-image-upload :max="1" :compress="true" v-model="currentImgData" :headers="headers"
            @uploadSuccess="imgUploadSuccess" @imgDelete="imgDeleteFn" :action="getLoginInfo.imgUploadApi">
           </htz-image-upload>
         </view>
-      </div>
+      </view>
 
-      <div class="app-footer">
+      <view class="app-footer">
         <button class="admin-button-com big default" @click="goBack()">取消</button>
         <button v-if="option.ptItemId" class="admin-button-com big blue" formType="submit" @click="status = 1">添加</button>
         <button v-else class="admin-button-com big blue" formType="submit" @click="status = 1">确认</button>
-      </div>
+      </view>
 
     </form>
-  </div>
+  </view>
 </template>
 
 <script>
@@ -467,7 +463,7 @@ export default {
         {
           name: "smallRatio",
           rule: ["required"],
-          msg: ["请填写单支价格倍数"]
+          msg: ["请填写单支价格系数"]
         },
         {
           name: "price",

ghsApp/src/admin/ptItem/itemList.vue

@@ -6,7 +6,7 @@
 				<app-search-module v-model="py" placeholder="输入英文字母搜索" @input="searchFnContrapose"/>
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/add',type:2 })">自定义</button>
+				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/add',type:2 })">新品种</button>
 			</view>
 		</view>
 		<view class="scroll-middle_bx">

ghsApp/src/pages.json

@@ -27,7 +27,7 @@
 		{
 			"root": "admin/ptItem",
 			"pages": [
-				{"path": "itemList","style": {"navigationBarTitleText": "平台花材列表","onReachBottonDistance":20}}
+				{"path": "itemList","style": {"navigationBarTitleText": "从平台导入花材","onReachBottonDistance":20}}
 			]
 		},
 		{

hdApp/src/admin/item/add.vue

@@ -11,7 +11,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">花材品种</view>
-          <view style="color:red;width:450upx;height:45upx;" @click.stop="notModify">{{form.name}}</view>
+          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{form.name}}</view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -49,7 +49,7 @@
             class="tui-input"
             name="discountPrice"
             @focus="form.discountPrice=''"
-            placeholder="没有特价填0"
+            placeholder="不做特价填0"
             maxlength="50"
             type="digit"
           />
@@ -523,9 +523,7 @@ export default {
         uni.navigateBack({});
       });
     },
-    // 表单验证
     formSubmit(e) {
-      // 表单规则
       let rules = [
         {
           name: "name",
@@ -602,14 +600,12 @@ export default {
           msg: ["请填写库存预警值"]
         }
       ];
-      // 进行表单检查
-      let formData = e.detail.value;
-      let checkRes = form.validation(formData, rules);
-      // 验证通过!
+      let formData = e.detail.value
+      let checkRes = form.validation(formData, rules)
       if (!checkRes) {
           this.confirmFn()
       } else {
-        this.$msg(checkRes);
+        this.$msg(checkRes)
       }
     }
   }
@@ -620,7 +616,6 @@ export default {
   min-height: calc(100vh - 100upx);
   padding-bottom: 150upx;
 }
-// 公共模块
 .module-com {
   margin-bottom: 20upx;
   background-color: #fff;
@@ -659,4 +654,4 @@ export default {
     width: 46%;
   }
 }
-</style>
+</style>

hdApp/src/admin/item/detail.vue

@@ -10,7 +10,7 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">花材品种</view> 
-          <view style="color:red;width:450upx;height:45upx;" @click.stop="notModify">{{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}</view>
+          <view style="color:#CCCCCC;width:450upx;height:45upx;" @click.stop="notModify">{{productData.ptItemInfo ? productData.ptItemInfo.name : ''}}</view>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -24,9 +24,9 @@
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
-          <view class="tui-title">单支价格倍数</view> 
-          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" style="width:330upx;" @focus="form.smallRatio=''"
-           placeholder="请填写" maxlength="30" type="number" /><text style="color:#666666;">¥<text>{{smallPrice}}</text></text>
+          <view class="tui-title">单支价格系数</view> 
+          <input v-model="form.smallRatio" placeholder-class="phcolor" class="tui-input" name="smallRatio" style="width:230upx;" @focus="form.smallRatio=''"
+           placeholder="请填写" maxlength="30" type="number" /><text style="color:#CCCCCC;">¥<text>{{smallPrice}}</text></text>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -36,8 +36,8 @@
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存</view> 
-          <input v-model="form.stock" style="width:340upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
-          <button v-if="productData.id > 0" class="admin-button-com blue small" @click="goStockDetail(productData.id)">库存明细</button>
+          <input v-model="form.stock" style="width:260upx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
+          <button v-if="productData.id > 0" class="admin-button-com blue middle" @click="goStockDetail(productData.id)">库存变动明细</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :arrow="true">
@@ -49,37 +49,33 @@
           </picker>
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :arrow="true">
+        <tui-list-cell class="line-cell" :arrow="false">
           <view class="tui-title">大单位</view> 
-          <picker mode="selector" :value="form.bigUnitId" :range="unitData" range-key="name" @change="changeBigUnitFn" class="tui-input" >
-            <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
-            <view v-if="form.bigUnitId">{{ bigUnitSelectedData.name }}</view> 
-            <view class="tui-placeholder" style="height:45upx;" v-else>请选择</view> 
-          </picker>
+          <input v-model="form.bigUnitId" name="bigUnitId" type="text" hidden />
+          <view v-if="form.bigUnitId" @click="$msg('不可修改')" style="color:#CCCCCC;width:450upx;height:45upx;">{{ bigUnitSelectedData.name }}</view> 
         </tui-list-cell>
 
-        <tui-list-cell class="line-cell" :arrow="true">
+        <tui-list-cell class="line-cell" :arrow="false">
           <view class="tui-title">小单位</view> 
-          <picker mode="selector" :value="form.smallUnitId" :range="unitData" range-key="name" @change="changeSmallUnitFn" class="tui-input" >
-            <input v-model="form.smallUnitId" name="smallUnitId" type="text" hidden />
-            <view v-if="form.smallUnitId">{{ smallUnitSelectedData.name }}</view> 
-            <view class="tui-placeholder" v-else>请选择</view> 
-          </picker>
+          <input v-model="form.smallUnitId" name="smallUnitId" type="text" hidden />
+          <view v-if="form.smallUnitId" @click="$msg('不可修改')" style="color:#CCCCCC;width:450upx;height:45upx;">{{ smallUnitSelectedData.name }}</view> 
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">单位比</view> 
-          <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" class="tui-input" name="ratio" placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
+          <input v-model="form.ratio" disabled="true" placeholder-class="phcolor" class="tui-input" name="ratio" @click="$msg('不可修改')" style="color:#CCCCCC;"
+          placeholder="如：1扎=20支，请填写20" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">每扎重量</view> 
-          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" class="tui-input" name="weight" placeholder="单位：公斤" maxlength="50" type="digit" />
+          <input v-model="form.weight" disabled="true" placeholder-class="phcolor" class="tui-input" @click="$msg('不可修改')" style="color:#CCCCCC;"
+          name="weight" placeholder="单位：公斤" maxlength="50" type="digit" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">库存预警值</view> 
-          <input v-model="form.stockWarning" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
+          <input v-model="form.stockWarning" @focus="form.stockWarning=''" placeholder-class="phcolor" class="tui-input" name="stockWarning" placeholder="请填写" maxlength="50" type="number" />
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">
@@ -417,7 +413,7 @@ export default {
         {
           name: "smallRatio",
           rule: ["required"],
-          msg: ["请填写单支价格倍数"]
+          msg: ["请填写单支价格系数"]
         },
         {
           name: "skAddPrice",

hdApp/src/admin/ptItem/itemList.vue

@@ -6,7 +6,7 @@
 				<app-search-module v-model="py" placeholder="输入英文字母搜索" @input="searchFnContrapose"/>
 			</view>
 			<view style="padding:0 0upx 0 20upx;" >
-				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/add',type:2 })">自定义</button>
+				<button class="admin-button-com middle blue" @click="pageTo({ url: '/admin/item/add',type:2 })">新品种</button>
 			</view>
 		</view>
 		<view class="scroll-middle_bx">

hdApp/src/admin/work/add.vue

@@ -6,7 +6,7 @@
         <tui-list-cell class="line-cell" :hover="false">
           <view class="tui-title">名称</view>
           <input v-model="form.name" placeholder-class="phcolor" class="tui-input" name="name" placeholder="请填写名称" maxlength="50" type="text" />
-          <button class="admin-button-com middle blue" style="width:180upx;" @click="selectMake()">选款</button>
+          <button class="admin-button-com big blue" style="width:190upx;" @click="selectMake()">选款式</button>
         </tui-list-cell>
 
         <tui-list-cell class="line-cell" :hover="false">

hdApp/src/api/product/index.js

@@ -1,5 +1,10 @@
 import https from "@/plugins/luch-request_0.0.7/request";
 
+//获取拼音首字母缩写 shish 20210707
+export const py = data => {
+	return https.get("/product/py", data);
+};
+
 export const getGhsProductDetail = data => {
 	return https.get('/product/ghs-product-detail', data)
 }

hdApp/src/pages.json

@@ -21,7 +21,7 @@
 		{
 			"root": "admin/ptItem",
 			"pages": [
-				{"path": "itemList","style": {"navigationBarTitleText": "平台花材列表","onReachBottonDistance":20}}
+				{"path": "itemList","style": {"navigationBarTitleText": "从平台导入花材","onReachBottonDistance":20}}
 			]
 		},
 		{