liangyan0105 hace 3 años
padre
commit
8ecd3fe804

+ 1 - 1
src/field/document/shipmentDetail.md

@@ -22,7 +22,7 @@ englishProductName '英文品名',
 state 单据状态    (0 保存,1 提交)
 pushState 推送状态    (1 要推送,2 推送失败)
 syShippingDetailsItemList 发运明细子表集合;
-
+ 
 #### 发运明细子表字段
 
 id '主键 id',

+ 95 - 4
src/views/shipment-details/shipmentList.vue

@@ -117,7 +117,7 @@
       >
         <!-- 推送状态 -->
         <span slot="pushState" slot-scope="text, record">
-          <a-tag color="#87d068" v-if="record.pushState == '0'">未推送</a-tag>
+          <a-tag color="#2db7f5" v-if="record.pushState == '0'">未推送</a-tag>
           <a-tag color="#87d068" v-if="record.pushState == '1'">推送成功</a-tag>
           <a-tag color="#f50" v-if="record.pushState == '2'">推送失败</a-tag>
         </span>
@@ -128,7 +128,7 @@
           <a-tag color="green" v-if="record.state == '1'">提交</a-tag>
         </span>
 
-        <!-- 操作 -->
+        <!-- 操作 未提交未推送-->
         <span slot="operationSlot" slot-scope="text, record">
           <a href="javascript:void(0);" @click="declareElements(record)" style="color:green">申报要素</a>
           <a-divider type="vertical" />
@@ -139,9 +139,7 @@
                 <a @click="details(record)">详情</a>
               </a-menu-item>
 
-              <!-- 判断是否提交 -->
               <a-menu-item>
-                <!-- <a @click="submit(record)">提交</a> -->
                 <a-popconfirm title="确定提交吗?" ok-text="是" cancel-text="否" @confirm="submit(record)">
                   <a href="javascript:void(0);">提交</a>
                 </a-popconfirm>
@@ -163,6 +161,99 @@
             </a-menu>
           </a-dropdown>
         </span>
+
+        <!-- 单据状态是 已提交 -->
+        <span v-if="record.state == 1" slot="operationSlot" slot-scope="text, record">
+          <a href="javascript:void(0);" @click="declareElements(record)" style="color:green">申报要素</a>
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多<a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="details(record)">详情</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a @click="edit(record)">编辑</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a @click="push(record)">推送</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record)">
+                  <a href="javascript:void(0);" style="color:red;">删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+        <!-- 推送状态是 已推送 -->
+        <span v-if="record.pushState == 1" slot="operationSlot" slot-scope="text, record">
+          <a href="javascript:void(0);" @click="declareElements(record)" style="color:green">申报要素</a>
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多<a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="details(record)">详情</a>
+              </a-menu-item>
+              <!-- <a-menu-item>
+                <a-popconfirm title="确定提交吗?" ok-text="是" cancel-text="否" @confirm="submit(record)">
+                  <a href="javascript:void(0);">提交</a>
+                </a-popconfirm>
+              </a-menu-item> -->
+              <a-menu-item>
+                <a @click="edit(record)">编辑</a>
+              </a-menu-item>
+
+              <!-- <a-menu-item>
+                <a @click="push(record)">推送</a>
+              </a-menu-item> -->
+
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record)">
+                  <a href="javascript:void(0);" style="color:red;">删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
+        <!-- 推送状态是 推送失败 -->
+        <span v-if="record.pushState === 2" slot="operationSlot" slot-scope="text, record">
+          <a href="javascript:void(0);" @click="declareElements(record)" style="color:green">申报要素</a>
+          <a-divider type="vertical" />
+          <a-dropdown>
+            <a class="ant-dropdown-link">更多<a-icon type="down"/></a>
+            <a-menu slot="overlay">
+              <a-menu-item>
+                <a @click="details(record)">详情</a>
+              </a-menu-item>
+              <!-- <a-menu-item>
+                <a-popconfirm title="确定提交吗?" ok-text="是" cancel-text="否" @confirm="submit(record)">
+                  <a href="javascript:void(0);">提交</a>
+                </a-popconfirm>
+              </a-menu-item> -->
+              <a-menu-item>
+                <a @click="edit(record)">编辑</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a @click="push(record)">再次推送</a>
+              </a-menu-item>
+
+              <a-menu-item>
+                <a-popconfirm title="确定删除吗?" ok-text="是" cancel-text="否" @confirm="handleDelete(record)">
+                  <a href="javascript:void(0);" style="color:red;">删除</a>
+                </a-popconfirm>
+              </a-menu-item>
+            </a-menu>
+          </a-dropdown>
+        </span>
+
       </a-table>
     </a-card>