Просмотр исходного кода

修改花材时库存和价格放一起来 OK
修改花材之后老是会返回 OK

shish 4 лет назад
Родитель
Сommit
05683831a5

+ 5 - 6
ghsApp/src/admin/home/workbench.vue

@@ -214,6 +214,11 @@ export default {
 					img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,
 					img: `${this.$constant.imgUrl}/ghs/home/pandian.png`,
 					url: "/pagesStorehouse/inventory/list"
 					url: "/pagesStorehouse/inventory/list"
 				},
 				},
+				{
+					name: "花材",
+					img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
+					url: "/admin/item/list"
+				},
 				{
 				{
 					name: "调拨出库",
 					name: "调拨出库",
 					img: `${this.$constant.imgUrl}/ghs/home/dbck.png`,
 					img: `${this.$constant.imgUrl}/ghs/home/dbck.png`,
@@ -224,12 +229,6 @@ export default {
 					img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,
 					img: `${this.$constant.imgUrl}/ghs/home/dbrk.png`,
 					url: "/pagesStorehouse/allot/allotPut"
 					url: "/pagesStorehouse/allot/allotPut"
 				},
 				},
-
-				{
-					name: "花材",
-					img: `${this.$constant.imgUrl}/ghs/home/hcgl.png`,
-					url: "/admin/item/list"
-				},
 				{
 				{
 					name: "员工",
 					name: "员工",
 					img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,
 					img: `${this.$constant.imgUrl}/ghs/home/yggl.png`,

+ 64 - 66
ghsApp/src/admin/item/detail.vue

@@ -30,26 +30,68 @@
           />
           />
         </tui-list-cell>
         </tui-list-cell>
 
 
-          <tui-list-cell class="line-cell" :arrow="true">
-            <div class="tui-title">分类</div>
-            <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:45rpx;" >{{ itemClassSelectedData.name }}</div>
-              <div class="tui-placeholder" style="height:45rpx;" v-else>请选择</div>
-            </picker>
-          </tui-list-cell>
-							<tui-list-cell class="line-cell" :hover="false">
-								<div class="tui-title">库存</div>
-								<input v-model="form.stock" style="width:340rpx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
-                <button v-if="productData.id" class="admin-button-com blue small" @click="goStockDetail(productData.id)">查看明细</button>
-							</tui-list-cell>
+        <tui-list-cell class="line-cell" :hover="false">
+          <div class="tui-title">库存</div>
+          <input v-model="form.stock" style="width:340rpx;" placeholder-class="phcolor" @focus="form.stock=''" @input="changeStock($event)" class="tui-input" name="stock" placeholder="请输入" type="digit"/>
+          <button v-if="productData.id" class="admin-button-com blue small" @click="goStockDetail(productData.id)">查看明细</button>
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :hover="false">
+          <div class="tui-title">售价</div>
+          <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"
+            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.addPrice"
+            placeholder-class="phcolor"
+            class="tui-input"
+            name="addPrice"
+            placeholder="请填写加价"
+            maxlength="50"
+            type="digit"
+          />
+        </tui-list-cell>
+
+        <tui-list-cell class="line-cell" :arrow="true">
+          <div class="tui-title">分类</div>
+          <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:45rpx;" >{{ itemClassSelectedData.name }}</div>
+            <div class="tui-placeholder" style="height:45rpx;" v-else>请选择</div>
+          </picker>
+        </tui-list-cell>
+
         <tui-list-cell class="line-cell" :arrow="true">
         <tui-list-cell class="line-cell" :arrow="true">
           <div class="tui-title">大单位</div>
           <div class="tui-title">大单位</div>
           <picker
           <picker
@@ -95,48 +137,6 @@
           />
           />
         </tui-list-cell>
         </tui-list-cell>
 
 
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">售价</div>
-          <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"
-          />
-        </tui-list-cell>
-
-        <tui-list-cell class="line-cell" :hover="false">
-          <div class="tui-title">每扎加价</div>
-          <input
-            v-model="form.addPrice"
-            placeholder-class="phcolor"
-            class="tui-input"
-            name="addPrice"
-            placeholder="请填写加价"
-            @focus="form.addPrice=''"
-            maxlength="50"
-            type="digit"
-          />
-        </tui-list-cell>
-
         <tui-list-cell class="line-cell" :hover="false">
         <tui-list-cell class="line-cell" :hover="false">
           <div class="tui-title">每扎重量</div>
           <div class="tui-title">每扎重量</div>
           <input
           <input
@@ -145,7 +145,6 @@
             class="tui-input"
             class="tui-input"
             name="weight"
             name="weight"
             placeholder="单位:公斤"
             placeholder="单位:公斤"
-            @focus="form.weight=''"
             maxlength="50"
             maxlength="50"
             type="digit"
             type="digit"
           />
           />
@@ -159,7 +158,6 @@
             class="tui-input"
             class="tui-input"
             name="stockWarning"
             name="stockWarning"
             placeholder="请填写"
             placeholder="请填写"
-            @focus="form.stockWarning=''"
             maxlength="50"
             maxlength="50"
             type="number"
             type="number"
           />
           />
@@ -418,7 +416,7 @@ export default {
 					return;
 					return;
 				}
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.discountPrice) == false){
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.discountPrice) == false){
-					uni.showToast({title:"请填写特价,没有特价请填0",icon:"none"})
+					uni.showToast({title:"请填写优惠价,没有优惠价请填0",icon:"none"})
 					return;
 					return;
 				}
 				}
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.price) == false){
 				if(/(^[1-9]([0-9]+)?(\.[0-9]{1,2})?$)|(^(0){1}$)|(^[0-9]\.[0-9]([0-9])?$)/.test(this.form.price) == false){
@@ -494,7 +492,7 @@ export default {
         {
         {
           name: "discountPrice",
           name: "discountPrice",
           rule: ["required"],
           rule: ["required"],
-          msg: ["不做特价请填0"]
+          msg: ["没有优惠价请填0"]
         },
         },
         {
         {
           name: "weight",
           name: "weight",

+ 3 - 3
hdApp/dist/build/mp-weixin/project.config.json

@@ -22,9 +22,9 @@
     "uploadWithSourceMap": true,
     "uploadWithSourceMap": true,
     "compileHotReLoad": false,
     "compileHotReLoad": false,
     "lazyloadPlaceholderEnable": false,
     "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "useApiHook": true,
-    "useApiHostProcess": true,
+    "useMultiFrameRuntime": false,
+    "useApiHook": false,
+    "useApiHostProcess": false,
     "babelSetting": {
     "babelSetting": {
       "ignore": [],
       "ignore": [],
       "disablePlugins": [],
       "disablePlugins": [],