自提发货修改

src/views/hisStore/storePayment/index.vue

@@ -137,6 +137,13 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item label="是否发货" prop="isShipment">
+        <el-select v-model="queryParams.isShipment" placeholder="请选择" clearable size="small">
+          <el-option label="未发货" :value="0" />
+          <el-option label="已发货" :value="1" />
+          <el-option label="发货失败" :value="-1" />
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -198,6 +205,13 @@
       <el-table-column label="所属部门" align="center" prop="deptName" />
       <el-table-column label="员工" align="center" prop="companyUserNickName" />
       <el-table-column label="小程序名称" align="center" prop="miniProgramName" width="120px" />
+      <el-table-column label="是否发货" align="center" prop="isShipment" width="100px">
+        <template slot-scope="scope">
+          <el-tag v-if="scope.row.isShipment === 1" type="success">已发货</el-tag>
+          <el-tag v-else-if="scope.row.isShipment === -1" type="danger">发货失败</el-tag>
+          <el-tag v-else type="info">未发货</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="status" >
           <template slot-scope="scope">
               <el-tag prop="status" v-for="(item, index) in statusOptions"    v-if="scope.row.status==item.dictValue">{{item.dictLabel}}</el-tag>
@@ -292,6 +306,27 @@
         <el-button @click="cancelRefund">取 消</el-button>
       </div>
     </el-dialog>
+    <el-dialog title="微信一键线下自提发货" :visible.sync="shippingDialog.open" width="500px" append-to-body>
+      <el-form label-width="100px">
+        <el-form-item label="选择小程序">
+          <el-select v-model="shippingDialog.appId" placeholder="全部小程序" clearable size="small" style="width: 100%">
+            <el-option
+              v-for="dict in shippingDialog.appMallList"
+              :key="dict.appid"
+              :label="dict.name + '(' + dict.appid + ')'"
+              :value="dict.appid"
+            />
+          </el-select>
+        </el-form-item>
+        <div style="color: #909399; font-size: 12px; padding-left: 10px;">
+          不选择小程序则推送全部
+        </div>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitOneClickShipping">确 定</el-button>
+        <el-button @click="shippingDialog.open = false">取 消</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 
@@ -306,6 +341,11 @@ export default {
   data() {
     return {
       appMallOptions:[],
+      shippingDialog: {
+        open: false,
+        appId: null,
+        appMallList: [],
+      },
       payModeOptions:[
         { dictLabel: "微信支付", dictValue: "wx" },
         { dictLabel: "汇付", dictValue: "hf" }
@@ -376,6 +416,7 @@ export default {
         bankTransactionId:null,
         companyUserNickName:null,
         appId:null,
+        isShipment:null,
       },
       // 表单参数
       form: {},
@@ -617,14 +658,26 @@ export default {
         }).catch(function() {});
     },
     wxOneClickShipping(){
-      this.$confirm('是否同步微信线下发货?', '一键发货', {
+      this.shippingDialog.open = true;
+      this.shippingDialog.appId = null;
+      getAppMallOptions({pageNum:1,pageSize:100,isMall:1}).then(response => {
+        this.shippingDialog.appMallList = response.rows;
+      });
+    },
+    submitOneClickShipping(){
+      var data = {};
+      if (this.shippingDialog.appId) {
+        data.appId = this.shippingDialog.appId;
+      }
+      this.$confirm(this.shippingDialog.appId ? '是否同步所选小程序的微信线下发货?' : '是否同步全部小程序的微信线下发货?', '一键发货', {
         confirmButtonText: '是',
         cancelButtonText: '否',
         type: 'warning'
       }).then(() => {
-        oneClickShipping().then(response => {
+        oneClickShipping(data).then(response => {
           if(response.code === 200) {
             this.$message.success("操作成功！")
+            this.shippingDialog.open = false;
             this.getList();
           }
         })