lilei 4 år sedan
förälder
incheckning
52a7be0161
3 ändrade filer med 50 tillägg och 35 borttagningar
  1. 3 3
      package-lock.json
  2. 1 1
      package.json
  3. 46 31
      src/views/equipmentManage/openTimeSetting/AddTimeModal.vue

+ 3 - 3
package-lock.json

@@ -2329,9 +2329,9 @@
       "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4="
     },
     "ant-design-vue": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.6.5.tgz",
-      "integrity": "sha512-FzLrK+JuJUq+g4vd+UjFFi13ZdSsb11EZFapisFXilJxpc1LxqyunZu5AP4nr9vFLs3J4UX2A6q+Rp/Fi6JrLg==",
+      "version": "1.7.1",
+      "resolved": "https://registry.npmjs.org/ant-design-vue/-/ant-design-vue-1.7.1.tgz",
+      "integrity": "sha512-oJizjG2qzt7yKDm9Jnm9DzNWW76+WHDUsy0bgpHnydv21aZW4DBGWE669XR7+w3XHGRV7BQlYKkvqWo97uyHZQ==",
       "requires": {
         "@ant-design/icons": "^2.1.1",
         "@ant-design/icons-vue": "^2.0.0",

+ 1 - 1
package.json

@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@antv/data-set": "^0.10.2",
-    "ant-design-vue": "^1.6.5",
+    "ant-design-vue": "^1.7.1",
     "axios": "^0.19.0",
     "china-division": "^2.3.1",
     "core-js": "2.6.9",

+ 46 - 31
src/views/equipmentManage/openTimeSetting/AddTimeModal.vue

@@ -36,16 +36,13 @@
                 v-decorator="[
                   `formData.openTime[${k}]`,
                   {
-                    initialValue: formData.openTime[`${k}`],
+                    initialValue: formData[`openTime[${k}]`],
                     validateTrigger: ['change', 'blur'],
                     rules: [
                       {
                         required: true,
                         message: '请选择投放开始时间!'
                       },
-                      {
-                        validator: changeTimeValidator
-                      }
                     ]
                   }
                 ]"
@@ -62,7 +59,7 @@
                 v-decorator="[
                   `formData.closeTime[${k}]`,
                   {
-                    initialValue: formData.closeTime[`${k}`],
+                    initialValue: formData[`closeTime[${k}]`],
                     validateTrigger: ['change', 'blur'],
                     rules: [{ required: true, message: '请选择投放结束时间!' }]
                   }
@@ -141,34 +138,26 @@ export default {
     getDetailData (id) {
       viewTimeSetting({ id: id }).then(res => {
         if (res.status == 200) {
-          this.formData.name = res.data.name
+          this.formData = Object.assign({}, this.formData, res.data)
           const list = res.data.deliveryTimeRuleItemList
-          this.index = list.length - 1
-          const keys = this.form.getFieldValue('keys')
-          let keysL = []
+          this.index = list.length
+          const keysL = []
           for (let x = 0; x < list.length; x++) {
-            keysL = keys.concat(x)
+            keysL[x] = x
           }
+          console.log(keysL, 'keysL')
           this.form.setFieldsValue({
             keys: keysL
           })
-          list.map(item => {
-            item.openTime = moment(item.openTime, 'HH:mm')
-            item.closeTime = moment(item.closeTime, 'HH:mm')
+
+          // 回显数据
+          list.map((item, index) => {
+            this.formData['openTime[' + index + ']'] = moment(item.openTime, 'HH:mm')
+            this.formData['closeTime[' + index + ']'] = moment(item.closeTime, 'HH:mm')
           })
-          this.form.setFieldsValue({ 'formData.deliveryTimeRuleItemList': list })
         }
       })
     },
-    // 校验
-    changeTimeValidator (rule, value, callback) {
-      console.log('value', value, rule)
-      const times = this.form.getFieldValue('times')
-      if (value === null) {
-        callback(new Error('请输入时间'))
-      }
-      callback()
-    },
     // 删除
     remove (k) {
       const { form } = this
@@ -179,31 +168,57 @@ export default {
       form.setFieldsValue({
         keys: keys.filter(key => key !== k)
       })
+      if (this.id) {
+        this.formData.deliveryTimeRuleItemList.splice(k, 1)
+        this.formData.openTime.splice(k, 1)
+        this.formData.closeTime.splice(k, 1)
+      }
     },
     // 增加
     add () {
       const { form } = this
       const keys = form.getFieldValue('keys')
-      console.log(keys, 'kkkkkk')
       const nextKeys = keys.concat(this.index++)
       form.setFieldsValue({
         keys: nextKeys
       })
+      this.formData.openTime[this.index - 1] = moment(null)
+      this.formData.closeTime[this.index - 1] = moment(null)
     },
     // 保存提交
     handleSubmit () {
       const _this = this
       this.form.validateFields((err, values) => {
-        console.log(values, ' formData.type222222222')
+        console.log(values, this.formData, ' formData.type222222222')
         if (!err) {
-          const params = values.formData
-          params.deliveryTimeRuleItemList.map(item => {
-            item.openTime = moment(item.openTime).format('HH:mm')
-            item.closeTime = moment(item.closeTime).format('HH:mm')
-          })
+          const { formData, keys } = values
+          const params = {
+            name: formData.name,
+            deliveryTimeRuleItemList: []
+          }
           if (this.id) {
             params.id = this.id
+            params.deliveryTimeRuleNo = this.formData.deliveryTimeRuleNo
+            keys.map((item, index) => {
+              console.log(index)
+              const fdeli = this.formData.deliveryTimeRuleItemList[index]
+              params.deliveryTimeRuleItemList[index] = {
+                openTime: moment(formData.openTime[index]).format('HH:mm'),
+                closeTime: moment(formData.closeTime[index]).format('HH:mm'),
+                deliveryTimeRuleItemNo: index < fdeli.length ? fdeli.deliveryTimeRuleItemNo : '',
+                deliveryTimeRuleNo: index < fdeli.length ? fdeli.deliveryTimeRuleNo : ''
+              }
+            })
+          } else {
+            keys.map((item, index) => {
+              params.deliveryTimeRuleItemList[index] = {
+                openTime: moment(formData.openTime[index]).format('HH:mm'),
+                closeTime: moment(formData.closeTime[index]).format('HH:mm')
+              }
+            })
           }
+          console.log(params)
+          return
           saveTimeSetting(params).then(res => {
             console.log(res, 'res--save')
             if (res.status + '' === '200') {
@@ -244,7 +259,6 @@ export default {
           preserve: true
         })
         this.index = 0
-        this.add()
         if (this.id) {
           // 编辑
           this.titleText = '编辑'
@@ -252,6 +266,7 @@ export default {
           this.getDetailData(this.id)
         } else {
           this.titleText = '新增'
+          this.add()
         }
       } else {
         this.cancel()