添加工单

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrEdit.vue

@@ -500,8 +500,11 @@ export default {
       this.mobileTableData.push(data)
     },
     btn_deleteMobile(val) {
-      const index = this.mobileTableData.indexOf(val)
-      this.mobileTableData.splice(index, 1)
+      this.mobileTableData.forEach((e,i) => {
+        if (e.mobileNumber === val) {
+          this.mobileTableData.splice(i, 1)
+        }
+      })
     },
     // 获取推荐人列表
     getRecommendList() {

CallCenterWeb.UI/src/views/memberManagement/memberList/components/addOrder.vue

@@ -44,11 +44,23 @@
             </el-col>
             <el-col :span="12">
               <el-form-item label="手机号码" prop="F_CustomerPhone">
-                <el-input
+                <el-select
+                  v-model="ruleForm.F_CustomerPhone"
+                  placeholder="请选择电话号码"
+                  class="form_select"
+                >
+                  <el-option
+                    v-for="item in customerPhoneList"
+                    :key="item.number"
+                    :label="item.number"
+                    :value="item.number"
+                  />
+                </el-select>
+                <!-- <el-input
                   v-model="ruleForm.F_CustomerPhone"
                   placeholder="请输入手机号码"
                   onkeyup="value=value.replace(/[^\d.]/g,'')"
-                />
+                /> -->
               </el-form-item>
             </el-col>
           </el-row>
@@ -234,7 +246,7 @@
                 </el-select>
               </el-form-item>
             </el-col>
-            <el-col :span="12">
+            <!-- <el-col :span="12">
               <el-form-item label="出库货仓" prop="F_Stock">
                 <el-select
                   v-model="ruleForm.F_Stock"
@@ -250,33 +262,7 @@
                   />
                 </el-select>
               </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
-            <!-- <el-col :span='12'>
-                <el-form-item label="快递单号" prop="F_TrackingNo" >
-                  <el-input v-model="ruleForm.F_TrackingNo" placeholder="请输入快递单号"/>
-                </el-form-item>
-              </el-col> -->
-            <el-col :span="12">
-              <el-form-item label="收件人" prop="F_Addressee">
-                <el-input
-                  v-model="ruleForm.F_Addressee"
-                  placeholder="请输入收件人"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item label="收件人手机号" prop="F_AddPhone">
-                <el-input
-                  v-model="ruleForm.F_AddPhone"
-                  placeholder="请输入收件人手机号"
-                  onkeyup="value=value.replace(/[^\d.]/g,'')"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
+            </el-col> -->
             <el-col :span="12">
               <el-form-item label="送货说明" prop="F_AddDes">
                 <el-select
@@ -293,39 +279,28 @@
                   />
                 </el-select>
               </el-form-item>
-              <!-- <el-form-item label="送货说明" prop="F_AddDes" >
-                  <el-input v-model="ruleForm.F_AddDes" placeholder="请输入送货说明"/>
-                </el-form-item> -->
             </el-col>
+          </el-row>
+          <el-row>
             <el-col :span="12">
-              <el-form-item label="支付方式" prop="F_PayType">
-                <el-select
-                  v-model="ruleForm.F_PayType"
-                  placeholder="请选择支付方式"
-                  class="form_select"
-                  clearable
-                >
-                  <el-option
-                    v-for="item in payTypeList"
-                    :key="item.F_Value"
-                    :label="item.F_Value"
-                    :value="item.F_Value"
-                  />
-                </el-select>
+              <el-form-item label="收件人" prop="F_Addressee">
+                <el-input
+                  v-model="ruleForm.F_Addressee"
+                  placeholder="请输入收件人"
+                />
+              </el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <el-form-item label="收件人手机号" prop="F_AddPhone">
+                <el-input
+                  v-model="ruleForm.F_AddPhone"
+                  placeholder="请输入收件人手机号"
+                  onkeyup="value=value.replace(/[^\d.]/g,'')"
+                />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
-            <!-- <el-col :span='12'>
-                <el-form-item label="快递" prop="F_Express" >
-                  <el-select v-model="ruleForm.F_Express" placeholder="请选择快递" class="form_select" clearable>
-                    <el-option v-for="item in expressList" :key="item.F_Value" :label="item.F_Value" :value="item.F_Value"></el-option>
-                  </el-select>
-                </el-form-item>
-              </el-col> -->
-          </el-row>
-          <el-row/>
-          <el-row>
             <el-col :span="6">
               <el-form-item label="使用积分" prop="F_UseScore">
                 <el-input
@@ -365,16 +340,6 @@
             </el-col>
           </el-row>
           <el-row>
-            <el-col :span="12">
-              <el-form-item label="推荐人手机号" prop="F_RecommenderTel">
-                <el-input
-                  v-model="ruleForm.F_RecommenderTel"
-                  placeholder="请输入推荐人手机号"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
             <el-col :span="24">
               <el-form-item label="选择地址">
                 <el-radio-group v-model="selectAddress" @change="changeAddress">
@@ -486,14 +451,21 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="是否提前付款" prop="F_IsPayment">
-                <el-radio-group
-                  v-model="ruleForm.F_IsPayment"
-                  @change="changeIsPayment"
+              <el-form-item label="支付方式" prop="F_PayType">
+                <el-select
+                  v-model="ruleForm.F_PayType"
+                  placeholder="请选择支付方式"
+                  class="form_select"
+                  clearable
+                  @change="changePayType"
                 >
-                  <el-radio :label="0">否</el-radio>
-                  <el-radio :label="1">是</el-radio>
-                </el-radio-group>
+                  <el-option
+                    v-for="item in payTypeList"
+                    :key="item.F_Value"
+                    :label="item.F_Value"
+                    :value="item.F_Value"
+                  />
+                </el-select>
               </el-form-item>
             </el-col>
           </el-row>
@@ -552,19 +524,6 @@
               </el-form-item>
             </el-col>
           </el-row>
-          <!-- <el-row>
-              <el-col :span='12'>
-                <el-form-item label="付款金额" prop="F_UseScore" >
-                  <el-date-picker
-                    v-model="ruleForm.F_PayTime"
-                    value-format="yyyy-MM-dd HH:mm:ss"
-                    type="datetime"
-                    class="form_date"
-                    placeholder="请选择支付时间">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-            </el-row> -->
           <el-form-item label="会员备注" prop="F_MemberNotes">
             <el-input
               :autosize="{ minRows: 4 }"
@@ -584,7 +543,6 @@
           <el-form-item>
             <el-button type="primary" @click="submitForm(0)">保存</el-button>
             <el-button type="primary" @click="submitForm(1)">提交</el-button>
-            <el-button @click="resetForm">重置</el-button>
           </el-form-item>
         </el-form>
       </div>
@@ -651,6 +609,7 @@ export default {
       townDatas: [], // 乡镇/下拉数据
       stockList: [], // 出库货仓下拉数据
       ADFromList: [], // 消息来源list
+      customerPhoneList: [], // 电话号码
       addDesList: [], // 送货说明
       expressList: [], // 快递
       payTypeList: [], // 支付方式
@@ -759,7 +718,7 @@ export default {
         F_CustomerPhone: [
           {
             required: true,
-            trigger: 'blur',
+            trigger: 'change',
             validator: validateTelRule
           }
         ],
@@ -819,19 +778,21 @@ export default {
     submitForm(state) {
       this.$refs.ruleForm.validate((valid) => {
         if (valid) {
+          console.log('this.ruleForm.OrderMoney', this.ruleForm.OrderMoney)
           this.ruleForm.F_State = state
           this.ruleForm.OrderDetailList = this.commodityTableData
           this.ruleForm.F_ExpressFee =
             this.ruleForm.F_ExpressFee == '' ? 0 : this.ruleForm.F_ExpressFee
           this.ruleForm.F_UseScore =
             this.ruleForm.F_UseScore == '' ? 0 : this.ruleForm.F_UseScore
+          this.ruleForm.OrderMoney.F_PayTime = this.ruleForm.OrderMoney.F_PayTime == '' ? '1970-01-01 00:00:00' : this.ruleForm.OrderMoney.F_PayTime
+          this.ruleForm.OrderMoney.F_Money = this.ruleForm.OrderMoney.F_Money == '' ? 0 : this.ruleForm.OrderMoney.F_Money
           this.loading = true
           addOrder(this.ruleForm)
             .then((response) => {
               this.loading = false
               if (response.state.toLowerCase() === 'success') {
                 this.$message.success('恭喜你，订单信息添加成功!')
-                this.resetForm()
               }
             })
             .catch(() => {
@@ -1076,6 +1037,7 @@ export default {
     recommendChangeSelect(item) {
       this.ruleForm.F_RecommendId = item.F_ID
       this.ruleForm.F_RecommendName = item.F_Name
+      this.ruleForm.F_RecommenderTel = item.F_Phone
     },
     // 获取商品
     getCommodityListSelect() {
@@ -1224,10 +1186,10 @@ export default {
       this.getTotalAmountFun()
     },
     // 是否提前付款change
-    changeIsPayment(val) {
-      if (val === 0) {
+    changePayType(val) {
+      if (val === '货到付款') {
         this.judgmentIsPayment = false
-      } else if (val === 1) {
+      } else {
         this.judgmentIsPayment = true
       }
     },
@@ -1277,6 +1239,24 @@ export default {
         this.alternateAddress2.area = data.F_Area2 // 区/县
         this.alternateAddress2.town = data.F_Town2 // 乡/镇
         this.alternateAddress2.address = data.F_Address2 // 详细地址
+
+        if (data.F_Phone) {
+          let phoneData = {
+            number: data.F_Phone
+          }
+          this.customerPhoneList.push(phoneData)
+          if (data.F_Mobile) {
+            let mobileArray = data.F_Mobile.split(',')
+            mobileArray.forEach((e, i) => {
+              let mobileData = {}
+              mobileData = {
+                number: e
+              }
+              this.customerPhoneList.push(mobileData)
+            });
+          }
+          this.ruleForm.F_CustomerPhone = data.F_Phone
+        }
         // if (response.data.F_Province) {
         //   if (response.data.F_City) {
         //     this.placeholderArea = response.data.F_Province+'/'

CallCenterWeb.UI/src/views/memberManagement/memberList/index.vue

@@ -147,7 +147,7 @@
           >添加订单</el-button
           >
           <el-button
-            v-permission="'HY_add'"
+            v-permission="'HY_addTodo'"
             type="text"
             @click="btn_addTodo(scope.row.F_Phone,scope.row.F_Name)"
           >添加待办</el-button