cz 1 год назад
Родитель
Сommit
5e723a90e2

+ 1 - 1
src/components/process/SendFunds.vue

@@ -535,7 +535,7 @@ const getDictData = () => {
     accountData.value = res.rows;
   });
   // 关联合同
-  proxy.post("/contract/page", { pageNum: 1, pageSize: 9999 }).then((res) => {
+  proxy.post("/contract/page", { pageNum: 1, pageSize: 9999, status: 30 }).then((res) => {
     contractList.value = res.rows;
   });
   // 部门树

+ 9 - 1
src/views/purchaseManage/purchaseManage/handoverSlip/index.vue

@@ -35,7 +35,7 @@
           <el-button
             type="primary"
             link
-            v-if="item.expendQuantity > 0"
+            v-if="item.expendQuantity >= 0"
             @click="handleClickDetails(item)"
             >查看</el-button
           >
@@ -58,6 +58,14 @@
             >转生产</el-button
           >
         </div>
+        <div v-else-if="item.expendQuantity == 0">
+          <el-button type="primary" link @click="handleFollow(item)"
+            >跟进</el-button
+          >
+          <el-button type="primary" link @click="lookRecords(item)"
+            >跟进记录</el-button
+          >
+        </div>
         <div v-else>
           <el-button
             type="primary"

+ 24 - 4
src/views/purchaseManage/purchaseManage/returnGoods/index.vue

@@ -172,6 +172,21 @@ const statusData = ref([
     value: "50",
   },
 ]);
+const refundStatus = ref([
+  {
+    label: "未退款",
+    value: "0",
+  },
+  {
+    label: "部分退款",
+    value: "10",
+  },
+  {
+    label: "已退款",
+    value: "20",
+  },
+]);
+
 const selectConfig = reactive([
   {
     label: "退货状态",
@@ -210,6 +225,7 @@ const config = computed(() => {
       attrs: {
         label: "单位",
         prop: "productUnit",
+        width: 100,
       },
       render(unit) {
         return proxy.dictDataEcho(unit, productUnit.value);
@@ -219,12 +235,14 @@ const config = computed(() => {
       attrs: {
         label: "退货数量",
         prop: "count",
+        width: 100,
       },
     },
     {
       attrs: {
         label: "退货状态",
         prop: "status",
+        width: 90,
       },
       render(status) {
         return proxy.dictValueLabel(status, statusData.value);
@@ -233,16 +251,17 @@ const config = computed(() => {
     {
       attrs: {
         label: "退款状态",
-        prop: "payStatus",
+        prop: "refundStatus",
+        width: 90,
       },
-      render() {
-        return "暂无";
+      render(status) {
+        return proxy.dictValueLabel(status, refundStatus.value);
       },
     },
     {
       attrs: {
         label: "操作人",
-        prop: "createUser",
+        prop: "opUserName",
       },
       //      render() {
       //   return "暂无";
@@ -252,6 +271,7 @@ const config = computed(() => {
       attrs: {
         label: "操作时间",
         prop: "createTime",
+        width: 155,
       },
     },