no message

src/views/auxiliaryFittings/attachmentProfile/index.vue

@@ -431,80 +431,80 @@ export default {
             )
           }
         },
-        {
-          md: 6,
-          isShow: this.formData.normType == 'M' ? true : false,
-          name: 'slot-component',
-          attributes: { placeholder: '请输入', type: 'number' },
-          formItemAttributes: {
-            label: '自有库存师傅分账金额',
-            prop: 'selfWorkerAmount',
-            rules: [...required]
-          },
-          render: (h, { props, onInput }) => {
-            var { value } = props
-            const that = this
-            return (
-              <div style="position: relative;">
-                <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
-                  <el-input
-                    v-model={this.formData.selfWorkerAmount}
-                    onChange={e => {
-                      this.formData.selfWorkerAmount = Number(this.formData.selfWorkerAmount).toFixed(2)
-                      if (e && Number(e) > Number(that.formData.normAmount)) {
-                        that.formData.selfWorkerAmount = ''
-                        return this.$message.warning('自有库存师傅分账金额必须小于收费标准！')
-                      }
-                      that.formData.selfWebsitAmount = this.Subtr(that.formData.normAmount, e)
-                    }}
-                    type="number"
-                    placeholder="请输入"
-                  ></el-input>
-                  <span style="margin-left: 10px;">元</span>
-                </div>
-              </div>
-            )
-          }
-        },
-        {
-          md: 6,
-          isShow: this.formData.normType == 'M' ? false : true,
-          name: 'slot-component',
-          attributes: { placeholder: '请输入', type: 'number' },
-          formItemAttributes: {
-            label: '师傅分账比例',
-            prop: 'selfWorkerAmount',
-            rules: [...required]
-          },
-          render: (h, { props, onInput }) => {
-            var { value } = props
-            const that = this
-            return (
-              <div style="position: relative;">
-                <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
-                  <el-input
-                    v-model={this.formData.selfWorkerAmount}
-                    onChange={e => {
-                      this.formData.selfWorkerAmount = Number(this.formData.selfWorkerAmount).toFixed(2)
-                      if (e && Number(e) < 0) {
-                        return this.$message.warning('师傅分账比例不能为0！')
-                      }
-                      if (e && this.accAdd(Number(e), Number(that.formData.selfWebsitAmount)) > 100) {
-                        this.formData.selfWorkerAmount = 0
-                        return this.$message.warning('商户与师傅分账比例和最大只能100%！')
-                      } else {
-                        that.formData.selfWebsitAmount = this.Subtr(100, e)
-                      }
-                    }}
-                    type="number"
-                    placeholder="请输入"
-                  ></el-input>
-                  <span style="margin-left: 10px;">%</span>
-                </div>
-              </div>
-            )
-          }
-        },
+        // {
+        //   md: 6,
+        //   isShow: this.formData.normType == 'M' ? true : false,
+        //   name: 'slot-component',
+        //   attributes: { placeholder: '请输入', type: 'number' },
+        //   formItemAttributes: {
+        //     label: '自有库存师傅分账金额',
+        //     prop: 'selfWorkerAmount',
+        //     rules: [...required]
+        //   },
+        //   render: (h, { props, onInput }) => {
+        //     var { value } = props
+        //     const that = this
+        //     return (
+        //       <div style="position: relative;">
+        //         <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
+        //           <el-input
+        //             v-model={this.formData.selfWorkerAmount}
+        //             onChange={e => {
+        //               this.formData.selfWorkerAmount = Number(this.formData.selfWorkerAmount).toFixed(2)
+        //               if (e && Number(e) > Number(that.formData.normAmount)) {
+        //                 that.formData.selfWorkerAmount = ''
+        //                 return this.$message.warning('自有库存师傅分账金额必须小于收费标准！')
+        //               }
+        //               that.formData.selfWebsitAmount = this.Subtr(that.formData.normAmount, e)
+        //             }}
+        //             type="number"
+        //             placeholder="请输入"
+        //           ></el-input>
+        //           <span style="margin-left: 10px;">元</span>
+        //         </div>
+        //       </div>
+        //     )
+        //   }
+        // },
+        // {
+        //   md: 6,
+        //   isShow: this.formData.normType == 'M' ? false : true,
+        //   name: 'slot-component',
+        //   attributes: { placeholder: '请输入', type: 'number' },
+        //   formItemAttributes: {
+        //     label: '师傅分账比例',
+        //     prop: 'selfWorkerAmount',
+        //     rules: [...required]
+        //   },
+        //   render: (h, { props, onInput }) => {
+        //     var { value } = props
+        //     const that = this
+        //     return (
+        //       <div style="position: relative;">
+        //         <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
+        //           <el-input
+        //             v-model={this.formData.selfWorkerAmount}
+        //             onChange={e => {
+        //               this.formData.selfWorkerAmount = Number(this.formData.selfWorkerAmount).toFixed(2)
+        //               if (e && Number(e) < 0) {
+        //                 return this.$message.warning('师傅分账比例不能为0！')
+        //               }
+        //               if (e && this.accAdd(Number(e), Number(that.formData.selfWebsitAmount)) > 100) {
+        //                 this.formData.selfWorkerAmount = 0
+        //                 return this.$message.warning('商户与师傅分账比例和最大只能100%！')
+        //               } else {
+        //                 that.formData.selfWebsitAmount = this.Subtr(100, e)
+        //               }
+        //             }}
+        //             type="number"
+        //             placeholder="请输入"
+        //           ></el-input>
+        //           <span style="margin-left: 10px;">%</span>
+        //         </div>
+        //       </div>
+        //     )
+        //   }
+        // },
         // {
         //   md: 6,
         //   isShow: this.formData.normType == 'M' ? true : false,
@@ -540,72 +540,72 @@ export default {
         //     )
         //   }
         // },
-        {
-          md: 6,
-          isShow: this.formData.normType == 'M' ? true : false,
-          name: 'slot-component',
-          attributes: { placeholder: '请输入', type: 'number' },
-          formItemAttributes: {
-            label: '自有库存商户分账金额',
-            prop: 'selfWebsitAmount',
-            rules: [...required]
-          },
-          render: (h, { props, onInput }) => {
-            var { value } = props
-            return (
-              <div style="position: relative;">
-                <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
-                  <el-input
-                    v-model={this.formData.selfWebsitAmount}
-                    disabled
-                    type="number"
-                    placeholder="请输入"
-                  ></el-input>
-                  <span style="margin-left: 10px;">元</span>
-                </div>
-              </div>
-            )
-          }
-        },
-        {
-          md: 6,
-          isShow: this.formData.normType == 'M' ? false : true,
-          name: 'slot-component',
-          attributes: { placeholder: '请输入', type: 'number' },
-          formItemAttributes: {
-            label: '商户分账比例',
-            prop: 'selfWebsitAmount',
-            rules: [...required]
-          },
-          render: (h, { props, onInput }) => {
-            var { value } = props
-            const that = this
-            return (
-              <div style="position: relative;">
-                <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
-                  <el-input
-                    v-model={this.formData.selfWebsitAmount}
-                    onChange={e => {
-                      this.formData.selfWebsitAmount = Number(this.formData.selfWebsitAmount).toFixed(2)
-                      if (e && Number(e) < 0) {
-                        return this.$message.warning('商户分账比例不能为0！')
-                      }
-                      if (e && this.accAdd(Number(e), Number(that.formData.selfWorkerAmount)) > 100) {
-                        this.formData.selfWebsitAmount = 0
-                        return this.$message.warning('商户与师傅分账比例和最大只能100%！')
-                      } else {
-                        that.formData.selfWorkerAmount = this.Subtr(100, e)
-                      }
-                    }}
-                    type="number"
-                    placeholder="请输入"
-                  ></el-input>
-                  <span style="margin-left: 10px;">%</span>
-                </div>
-              </div>
-            )
-          }
-        },
+        // {
+        //   md: 6,
+        //   isShow: this.formData.normType == 'M' ? true : false,
+        //   name: 'slot-component',
+        //   attributes: { placeholder: '请输入', type: 'number' },
+        //   formItemAttributes: {
+        //     label: '自有库存商户分账金额',
+        //     prop: 'selfWebsitAmount',
+        //     rules: [...required]
+        //   },
+        //   render: (h, { props, onInput }) => {
+        //     var { value } = props
+        //     return (
+        //       <div style="position: relative;">
+        //         <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
+        //           <el-input
+        //             v-model={this.formData.selfWebsitAmount}
+        //             disabled
+        //             type="number"
+        //             placeholder="请输入"
+        //           ></el-input>
+        //           <span style="margin-left: 10px;">元</span>
+        //         </div>
+        //       </div>
+        //     )
+        //   }
+        // },
+        // {
+        //   md: 6,
+        //   isShow: this.formData.normType == 'M' ? false : true,
+        //   name: 'slot-component',
+        //   attributes: { placeholder: '请输入', type: 'number' },
+        //   formItemAttributes: {
+        //     label: '商户分账比例',
+        //     prop: 'selfWebsitAmount',
+        //     rules: [...required]
+        //   },
+        //   render: (h, { props, onInput }) => {
+        //     var { value } = props
+        //     const that = this
+        //     return (
+        //       <div style="position: relative;">
+        //         <div style="display: flex;justify-content: space-around;align-items: center;position: relative;">
+        //           <el-input
+        //             v-model={this.formData.selfWebsitAmount}
+        //             onChange={e => {
+        //               this.formData.selfWebsitAmount = Number(this.formData.selfWebsitAmount).toFixed(2)
+        //               if (e && Number(e) < 0) {
+        //                 return this.$message.warning('商户分账比例不能为0！')
+        //               }
+        //               if (e && this.accAdd(Number(e), Number(that.formData.selfWorkerAmount)) > 100) {
+        //                 this.formData.selfWebsitAmount = 0
+        //                 return this.$message.warning('商户与师傅分账比例和最大只能100%！')
+        //               } else {
+        //                 that.formData.selfWorkerAmount = this.Subtr(100, e)
+        //               }
+        //             }}
+        //             type="number"
+        //             placeholder="请输入"
+        //           ></el-input>
+        //           <span style="margin-left: 10px;">%</span>
+        //         </div>
+        //       </div>
+        //     )
+        //   }
+        // },
         // {
         //   md: 6,
         //   isShow: this.formData.normType == 'M' ? true : false,

src/views/auxiliaryFittings/auxiliaryDataManagement/auxiliaryChargeManagement/index.vue

@@ -18,7 +18,7 @@
       <div v-if="~['add', 'edit'].indexOf(activeKey)">
         <div style="box-sizing: border-box; padding: 20px">
           <zj-form-container ref="formRef" :form-data="formData" :styleSwitch="false">
-            <zj-form-module title="编辑" label-width="180px" :form-data="formData" :form-items="formItems">
+            <zj-form-module title="编辑" label-width="120px" :form-data="formData" :form-items="formItems">
             </zj-form-module>
             <zj-form-module
               v-if="formData.normType === 'M'"
@@ -371,30 +371,30 @@ export default {
             return <div style="color:red">注：分账金额需扣除手续费0.6%</div>
           }
         },
-        {
-          md: 6,
-          isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', type: 'number', disabled: !this.formData.normAmount },
-          formItemAttributes: {
-            label: '自有库存师傅(分账金额)',
-            prop: 'selfWorkerAmount',
-            rules: [...required]
-          },
-          events: {
-            input: val => {
-              if (Number(val) > this.formData.normAmount) {
-                this.formData.selfWorkerAmount = this.setNumber(this.formData.normAmount)
-              }
-              this.formData.selfWebsitAmount = this.setNumber(this.formData.normAmount - this.formData.selfWorkerAmount)
-            }
-          },
-          slots: {
-            append: (h, { props, onInput }) => {
-              return <div>元</div>
-            }
-          }
-        },
+        // {
+        //   md: 6,
+        //   isShow: true,
+        //   name: 'el-input',
+        //   attributes: { placeholder: '请输入', type: 'number', disabled: !this.formData.normAmount },
+        //   formItemAttributes: {
+        //     label: '自有库存师傅(分账金额)',
+        //     prop: 'selfWorkerAmount',
+        //     rules: [...required]
+        //   },
+        //   events: {
+        //     input: val => {
+        //       if (Number(val) > this.formData.normAmount) {
+        //         this.formData.selfWorkerAmount = this.setNumber(this.formData.normAmount)
+        //       }
+        //       this.formData.selfWebsitAmount = this.setNumber(this.formData.normAmount - this.formData.selfWorkerAmount)
+        //     }
+        //   },
+        //   slots: {
+        //     append: (h, { props, onInput }) => {
+        //       return <div>元</div>
+        //     }
+        //   }
+        // },
         // {
         //   md: 6,
         //   isShow: true,
@@ -419,22 +419,22 @@ export default {
         //     }
         //   }
         // },
-        {
-          md: 6,
-          isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', disabled: true, type: 'number' },
-          formItemAttributes: {
-            label: '自有库存商户(分账金额)',
-            prop: 'selfWebsitAmount',
-            rules: [...required]
-          },
-          slots: {
-            append: (h, { props, onInput }) => {
-              return <div>元</div>
-            }
-          }
-        },
+        // {
+        //   md: 6,
+        //   isShow: true,
+        //   name: 'el-input',
+        //   attributes: { placeholder: '请输入', disabled: true, type: 'number' },
+        //   formItemAttributes: {
+        //     label: '自有库存商户(分账金额)',
+        //     prop: 'selfWebsitAmount',
+        //     rules: [...required]
+        //   },
+        //   slots: {
+        //     append: (h, { props, onInput }) => {
+        //       return <div>元</div>
+        //     }
+        //   }
+        // },
         // {
         // md: 6,
         // isShow: true,
@@ -451,17 +451,17 @@ export default {
         //   }
         // }
         // },
-        {
-          md: 6,
-          isShow: true,
-          name: 'el-input',
-          attributes: { placeholder: '请输入', type: 'number' },
-          formItemAttributes: {
-            label: '师傅手工费用',
-            prop: 'manualAmount',
-            rules: [...required]
-          }
-        },
+        // {
+        //   md: 6,
+        //   isShow: true,
+        //   name: 'el-input',
+        //   attributes: { placeholder: '请输入', type: 'number' },
+        //   formItemAttributes: {
+        //     label: '师傅手工费用',
+        //     prop: 'manualAmount',
+        //     rules: [...required]
+        //   }
+        // },
         {
           md: 24,
           isShow: true,

src/views/auxiliaryFittings/auxiliaryDataManagement/auxiliaryPriceManagement/index.vue

@@ -92,6 +92,7 @@ export default {
         marketPrice: '',
         manageWorkerStock: 'YES',
         goodsSalesConvertQty: 1,
+        goodsSalesUnit: '',
         normAmount: '',
         normType: '',
         outWebsitAmount: '',
@@ -352,6 +353,17 @@ export default {
           }
         },
         {
+          md: 6,
+          isShow: true,
+          name: 'el-input',
+          attributes: { placeholder: '请输入' },
+          formItemAttributes: {
+            label: '销售单位',
+            prop: 'goodsSalesUnit',
+            rules: [...required]
+          }
+        },
+        {
           md: 24,
           isShow: true,
           name: 'el-input',