Ver Fonte

【修改】调整

zhouhao há 2 anos atrás
pai
commit
fdb476ff2e

+ 17 - 14
src/views/supply/apply/apply_list.vue

@@ -3,13 +3,14 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse :screen-form="screenForm">
           <template #left_btn>
             <el-radio-group v-model="screenForm.status" size="mini" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>
               <el-radio-button v-for="(item, index) in statusList" :key="index" :label="item.value">{{
-                item.label
-              }}</el-radio-button>
+                  item.label
+                }}
+              </el-radio-button>
             </el-radio-group>
           </template>
           <template #right_btn>
@@ -142,7 +143,7 @@
                     <el-input v-model="screenForm.createBy" placeholder="请输入制单人" />
                   </el-form-item>
                 </el-col>
-                <el-col :xs="24" :sm="12" :lg="6"> </el-col>
+                <el-col :xs="24" :sm="12" :lg="6"></el-col>
               </el-row>
             </el-form>
           </template>
@@ -158,7 +159,8 @@
               type="primary"
               icon="el-icon-plus"
               @click="toForm()"
-              >发货申请</el-button
+            >发货申请
+            </el-button
             >
             <el-button
               v-if="$checkBtnRole('refund', $route.meta.roles)"
@@ -166,7 +168,8 @@
               type="primary"
               icon="el-icon-plus"
               @click="toReturnForm()"
-              >退货申请</el-button
+            >退货申请
+            </el-button
             >
             <el-button
               v-if="$checkBtnRole('examine', $route.meta.roles)"
@@ -175,7 +178,8 @@
               icon="el-icon-finished"
               :disabled="multipleSelection.length < 1"
               @click="batchExamine"
-              >批量审批</el-button
+            >批量审批
+            </el-button
             >
           </div>
           <div class="fr">
@@ -360,8 +364,9 @@
               min-width="160"
               show-overflow-tooltip
             >
-              <template slot-scope="scope">
-                {{ scope.row.gejiangSync === 1 ? '同步成功' : scope.row.gejiangSync === 0 ? '待同步' : '同步失败' }}
+              <template slot-scope="{row}">
+                {{ row.gejiangSync === 1 ? '同步成功' : row.gejiangSync === 0 ? '待同步' : row.gejiangSync === -1 ? '同步失败' : '未同步'
+                }}
               </template>
             </el-table-column>
             <el-table-column
@@ -449,7 +454,7 @@
                 >
                   审单
                 </el-button>
-                <el-button type="text" @click="toDetail(scope.row)"> 详情 </el-button>
+                <el-button type="text" @click="toDetail(scope.row)"> 详情</el-button>
                 <el-popconfirm
                   v-if="
                     $checkBtnRole('del', $route.meta.roles) &&
@@ -689,9 +694,7 @@ export default {
       this.currentPage = 1
       this.getList()
     },
-    handleCollapse() {
-      this.isCollapse = !this.isCollapse
-    },
+
     // 重置筛选表单
     resetScreenForm() {
       this.$refs.screenForm.resetFields()
@@ -824,7 +827,7 @@ export default {
      * @param {String} index - 索引值
      * @return Boolean
      */
-    selectable: function (row, index) {
+    selectable: function(row, index) {
       if (row.automaticStatus) {
         return false
       }

+ 1 - 1
src/views/supply/apply/engin_list.vue

@@ -3,7 +3,7 @@
     <div v-show="!isShowDetail && !isShowExamine && !isShowForm && !isShowReturnForm">
       <!-- 筛选条件 -->
       <div class="screen-container">
-        <Collapse :is-collapse="isCollapse" :screen-form="screenForm">
+        <Collapse   :screen-form="screenForm">
           <template #left_btn>
             <el-radio-group size="mini" v-model="screenForm.status" @change="getList()">
               <el-radio-button label="">全部</el-radio-button>