Jelajahi Sumber

点检配置修改

lilei 4 tahun lalu
induk
melakukan
18a2cd29fa

+ 3 - 8
components/uni-check-list/uni-check-list.vue

@@ -82,26 +82,20 @@ export default {
 	watch: {
 		listData(newValue, oldValue) {
 			this.list = newValue;
-			this.hasCheck();
 		},
-		defValue(newValue) {
-			console.log(newValue)
-			this.value = newValue;
-			this.hasCheck();
-		}
 	},
 	mounted() {
 		this.hasCheck();
 	},
 	methods: {
 		hasCheck() {
-			this.list.map(item => {
+			this.list.map((item,index) => {
 				let a = this.value.findIndex(k=>{
 					return this.backValue == 'idArr' ? k == item.id : k.id == item.id
 				})
 				item.checked = a>=0
+				this.list.splice(index,1,item)
 			})
-			console.log(this.list,'111111111')
 		},
 		// 选中
 		chooseItem(item) {
@@ -118,6 +112,7 @@ export default {
 					this.value.push(this.backValue == 'idArr' ? item.id : item);
 				}
 			}
+			this.hasCheck();
 		},
 		rightClick(item) {
 			this.$emit('rightClick', item);

+ 37 - 11
pages/spotCheckConfigure/addSpotCheck.vue

@@ -2,46 +2,47 @@
 	<view class="pageInfo">
 		<view>
 			<u-form :model="form" ref="uForm" :error-type="['toast']">
-				<u-form-item label="任务名称" label-width="160rpx" prop="name">
+				<u-form-item label="任务名称" required  label-width="160rpx" prop="name">
 					<u-input v-model="form.name" input-align="right" placeholder="请输入任务名称(最多30个字符)" :maxlength="30" />
 				</u-form-item>
-				<u-form-item label="任务周期" v-model="form.cycleType" label-width="160rpx" prop="cycleType">
+				<u-form-item label="任务周期" required v-model="form.cycleType" label-width="160rpx" prop="cycleType">
 					<v-select ref="cycleType" inputAlign="right" code="TASK_CONFIG_CYCLE_TYPE" placeholder="请选择任务周期" v-model="form.cycleType"></v-select>
 				</u-form-item>
-				<u-form-item label="执行日期" v-if="form.cycleType == 'DAY'" label-width="160rpx" prop="buildDateDay">
+				<u-form-item label="执行日期" required v-show="form.cycleType == 'DAY'" label-width="160rpx" prop="buildDateDay">
 					<u-input v-model="form.buildDateDay" @click="showBuildDateDay = true" input-align="right" placeholder="请选择执行时间" type="select" />
 					<u-picker v-model="showBuildDateDay" @confirm="confirmBuildDateDay" mode="time" :default-time="form.buildDateDay"></u-picker>
 				</u-form-item>
-				<u-form-item label="执行日期" v-if="form.cycleType == 'WEEK'" label-width="160rpx" prop="buildDateWeekList">
+				<u-form-item label="执行日期" required v-show="form.cycleType == 'WEEK'" label-width="160rpx" prop="buildDateWeekList">
 					<view v-if="form.buildDateWeekList.length" style="width: 100%;text-align: right;" @click="openWeekSel">
 					{{weekNamesList}}
 					</view>
 					<view v-else style="color:rgb(192,196,204); width: 100%;text-align: right;" @click="openWeekSel">请选择</view>
 					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888" @click="openWeekSel"></u-icon>
 				</u-form-item>
-				<u-form-item label="执行时间" label-width="160rpx" prop="buildTime">
+				<u-form-item label="执行时间" required label-width="160rpx" prop="buildTime">
 					<u-input v-model="form.buildTime" @click="showBuildTime = true" input-align="right" placeholder="请选择执行时间" type="select" />
 					<u-picker v-model="showBuildTime" title="请选择执行时间" @confirm="confirmZxTime" mode="time" :params="ZxTimeParams" :default-time="form.buildTime"></u-picker>
 				</u-form-item>
-				<u-form-item label="开始日期" label-width="160rpx" prop="startDate">
+				<u-form-item label="开始日期" required 
+				label-width="160rpx" prop="startDate">
 					<u-input v-model="form.startDate" :disabled="form.cycleType == 'DAY'" @click="openStartDate" input-align="right" placeholder="请选择开始日期" :type="form.cycleType == 'DAY'?'text':'select'" />
 					<u-picker v-model="showPickerBegin" title="请选择开始日期" @confirm="confirmStartDate" mode="time" :default-time="form.startDate"></u-picker>
 				</u-form-item>
-				<u-form-item label="结束日期" label-width="160rpx" prop="endDate">
+				<u-form-item label="结束日期" required label-width="160rpx" prop="endDate">
 					<u-input v-model="form.endDate" :disabled="form.cycleType == 'DAY'" @click="openEndDate" input-align="right" placeholder="请选择结束日期" :type="form.cycleType == 'DAY'?'text':'select'" />
 					<u-picker v-model="showPickerEnd"  title="请选择结束日期" @confirm="confirmEndDate" mode="time" :default-time="form.endDate"></u-picker>
 				</u-form-item>
-				<u-form-item label="考评指标" label-width="160rpx" prop="assessList">
+				<u-form-item label="考评指标" required label-width="160rpx" prop="assessList">
 					<view v-if="form.assessList.length" style="width: 100%;text-align: right;" @click="openZBpage">{{form.assessList.length + '项指标'}}</view>
 					<view v-else style="color:rgb(192,196,204); width: 100%;text-align: right;" @click="openZBpage">请选择考评指标</view>
 					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888" @click="openZBpage"></u-icon>
 				</u-form-item>
-				<u-form-item label="考评门店" label-width="160rpx" prop="storeList">
+				<u-form-item label="考评门店" required label-width="160rpx" prop="storeList">
 					<view v-if="form.storeList.length" style="width: 100%;text-align: right;" @click="openMDpage">{{form.storeList.length + '个门店'}}</view>
 					<view v-else style="color:rgb(192,196,204); width: 100%;text-align: right;" @click="openMDpage">请选择考评门店</view>
 					<u-icon name="icon-xian-11" custom-prefix="xd-icon" size="28" color="#888888" @click="openMDpage"></u-icon>
 				</u-form-item>
-				<u-form-item label="有效天数" label-width="160rpx" prop="effectiveDay">
+				<u-form-item label="有效天数" required label-width="160rpx" prop="effectiveDay">
 					<u-input v-model="form.effectiveDay" type="number" input-align="right" placeholder="请输入任务有效天数" /> 天
 				</u-form-item>
 			</u-form>
@@ -101,7 +102,6 @@ export default {
 			rules: {
 				name: [{ required: true, message: '请输入名称30个字以内', trigger: 'blur' }],
 				cycleType: [{ required: true, message: '请选择任务周期', trigger: 'blur' }],
-				buildDateDay: [{ required: true, message: '请选择执行日期', trigger: 'blur' }],
 				buildTime: [{ required: true, message: '请选择执行时间', trigger: 'blur' }],
 				startDate: [{ required: true, message: '请选择开始日期', trigger: 'blur' }],
 				endDate: [{ required: true, message: '请选择结束日期', trigger: 'blur' }],
@@ -114,6 +114,18 @@ export default {
 			return this.getWeekNames(this.form.buildDateWeekList)
 		}
 	},
+	watch: {
+		"form.cycleType": function(newValue, oldValue) {
+			console.log(newValue)
+			if(oldValue&&newValue!=oldValue){
+				this.form.buildDateDay = ''
+				this.form.buildDateWeekList = []
+				this.form.buildTime = ''
+				this.form.startDate = ''
+				this.form.endDate = ''
+			}
+		}
+	},
 	onLoad(opts) {
 		if(opts.id){
 			// 编辑
@@ -268,6 +280,20 @@ export default {
 		// 提交
 		submit() {
 			console.log(this.form);
+			if(this.form.buildDateDay == ''&&this.form.cycleType=="DAY"){
+				uni.showToast({
+					icon: 'none',
+					title: '请选择执行日期'
+				})
+				return
+			}
+			if(this.form.buildDateWeekList == ''&&this.form.cycleType=="WEEK"){
+				uni.showToast({
+					icon: 'none',
+					title: '请选择执行日期'
+				})
+				return
+			}
 			this.$refs.uForm.validate(valid => {
 				if (valid) {
 					if(this.form.assessList.length==0){

+ 3 - 0
pages/spotCheckConfigure/spotCheckList.vue

@@ -38,6 +38,7 @@ export default {
 		this.getList();
 		uni.$on("updateCheckTaskConfigList",()=>{
 			this.pageNo = 1;
+			this.list = []
 			this.getList();
 		})
 	},
@@ -96,7 +97,9 @@ export default {
 			let status = item.status == 1 ? 0 : 1
 			enableCheckTaskConfig({id:item.id,flag: status}).then(res=>{
 				if(res.status == 200){
+					console.log(_this.list,status)
 					let i = _this.list.findIndex(a=>a.id == item.id)
+					console.log(i)
 					_this.list[i].status = status
 					_this.list.splice()
 				}

File diff ditekan karena terlalu besar
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


+ 95 - 82
unpackage/dist/dev/app-plus/app-view.js

@@ -19316,92 +19316,105 @@ var render = function() {
                 ],
                 1
               ),
-              _vm._$g(7, "i")
-                ? _c(
-                    "u-form-item",
-                    { attrs: { _i: 7 } },
-                    [
-                      _c("u-input", {
-                        attrs: { _i: 8 },
-                        on: {
-                          click: function($event) {
-                            return _vm.$handleViewEvent($event)
+              _c(
+                "u-form-item",
+                {
+                  directives: [
+                    {
+                      name: "show",
+                      rawName: "v-show",
+                      value: _vm._$g(7, "v-show"),
+                      expression: "_$g(7,'v-show')"
+                    }
+                  ],
+                  attrs: { _i: 7 }
+                },
+                [
+                  _c("u-input", {
+                    attrs: { _i: 8 },
+                    on: {
+                      click: function($event) {
+                        return _vm.$handleViewEvent($event)
+                      }
+                    },
+                    model: {
+                      value: _vm._$g(8, "v-model"),
+                      callback: function() {},
+                      expression: "form.buildDateDay"
+                    }
+                  }),
+                  _c("u-picker", {
+                    attrs: { _i: 9 },
+                    on: {
+                      confirm: function($event) {
+                        return _vm.$handleViewEvent($event)
+                      }
+                    },
+                    model: {
+                      value: _vm._$g(9, "v-model"),
+                      callback: function() {},
+                      expression: "showBuildDateDay"
+                    }
+                  })
+                ],
+                1
+              ),
+              _c(
+                "u-form-item",
+                {
+                  directives: [
+                    {
+                      name: "show",
+                      rawName: "v-show",
+                      value: _vm._$g(10, "v-show"),
+                      expression: "_$g(10,'v-show')"
+                    }
+                  ],
+                  attrs: { _i: 10 }
+                },
+                [
+                  _vm._$g(11, "i")
+                    ? _c(
+                        "v-uni-view",
+                        {
+                          staticStyle: { width: "100%", "text-align": "right" },
+                          attrs: { _i: 11 },
+                          on: {
+                            click: function($event) {
+                              return _vm.$handleViewEvent($event)
+                            }
                           }
                         },
-                        model: {
-                          value: _vm._$g(8, "v-model"),
-                          callback: function() {},
-                          expression: "form.buildDateDay"
-                        }
-                      }),
-                      _c("u-picker", {
-                        attrs: { _i: 9 },
-                        on: {
-                          confirm: function($event) {
-                            return _vm.$handleViewEvent($event)
+                        [_vm._v(_vm._$g(11, "t0-0"))]
+                      )
+                    : _c(
+                        "v-uni-view",
+                        {
+                          staticStyle: {
+                            color: "rgb(192,196,204)",
+                            width: "100%",
+                            "text-align": "right"
+                          },
+                          attrs: { _i: 12 },
+                          on: {
+                            click: function($event) {
+                              return _vm.$handleViewEvent($event)
+                            }
                           }
                         },
-                        model: {
-                          value: _vm._$g(9, "v-model"),
-                          callback: function() {},
-                          expression: "showBuildDateDay"
-                        }
-                      })
-                    ],
-                    1
-                  )
-                : _vm._e(),
-              _vm._$g(10, "i")
-                ? _c(
-                    "u-form-item",
-                    { attrs: { _i: 10 } },
-                    [
-                      _vm._$g(11, "i")
-                        ? _c(
-                            "v-uni-view",
-                            {
-                              staticStyle: {
-                                width: "100%",
-                                "text-align": "right"
-                              },
-                              attrs: { _i: 11 },
-                              on: {
-                                click: function($event) {
-                                  return _vm.$handleViewEvent($event)
-                                }
-                              }
-                            },
-                            [_vm._v(_vm._$g(11, "t0-0"))]
-                          )
-                        : _c(
-                            "v-uni-view",
-                            {
-                              staticStyle: {
-                                color: "rgb(192,196,204)",
-                                width: "100%",
-                                "text-align": "right"
-                              },
-                              attrs: { _i: 12 },
-                              on: {
-                                click: function($event) {
-                                  return _vm.$handleViewEvent($event)
-                                }
-                              }
-                            },
-                            [_vm._v("请选择")]
-                          ),
-                      _c("u-icon", {
-                        attrs: { _i: 13 },
-                        on: {
-                          click: function($event) {
-                            return _vm.$handleViewEvent($event)
-                          }
-                        }
-                      })
-                    ],
-                    1
-                  )
-                : _vm._e(),
+                        [_vm._v("请选择")]
+                      ),
+                  _c("u-icon", {
+                    attrs: { _i: 13 },
+                    on: {
+                      click: function($event) {
+                        return _vm.$handleViewEvent($event)
+                      }
+                    }
+                  })
+                ],
+                1
+              ),
               _c(
                 "u-form-item",
                 { attrs: { _i: 14 } },

Beberapa file tidak ditampilkan karena terlalu banyak file yang berubah dalam diff ini