Merge branch 'dev_ren' of http://113.105.137.151:22280/zhoujw/rs-cloud-platform-ui into dev_ren

src/views/orderManagement/demandList/index.vue

@@ -28,7 +28,17 @@
         <el-button type="primary" plain @click="clear">清除搜索</el-button>
       </el-form>
       <div class="orderItem" v-for="(item, idx) in tableData" :key="idx">
-        <div class="itemTop">提交时间：{{ item.crtTimeStr }}</div>
+        <div class="itemTop">
+          提交时间：{{ item.crtTimeStr }}
+
+          <span style="color: red; margin-left: 10px" v-if="item.type == 1"
+            >标准数据</span
+          ><span style="color: orange; margin-left: 10px" v-if="item.type == 2"
+            >行业应用</span
+          ><span style="color: blue; margin-left: 10px" v-if="item.type == 3"
+            >影像图库</span
+          >
+        </div>
         <div class="itemContent">
           <div class="itemLeft">
             <div class="itemInfo">
@@ -54,7 +64,7 @@
                 <p v-if="item.type == 2">联系方式：{{ item.contactPhone }}</p>
               </div>
               <div v-if="item.type == 3">
-                <p>定制类型：{{ item.dataType }}</p>
+                <p>数据类型：{{ item.dataType }}</p>
                 <p>数据格式：{{ item.dataFormat }}</p>
               </div>
             </div>

src/views/orderManagement/orderList/index.vue

@@ -108,11 +108,7 @@
       </el-row>
       <el-row>
         <el-col :span="8">
-          <el-button
-            type="primary"
-            plain
-            @click="handleFilter"
-            icon="el-icon-search"
+          <el-button type="primary" icon="el-icon-search" @click="handleFilter"
             >筛选</el-button
           >
           <el-button type="primary" plain @click="clear_search"
@@ -234,7 +230,7 @@
                   }}
                 </p>
                 <p v-if="item.customerJson.type == 3">
-                  定制类型：{{ item.customerJson.dataType }}
+                  数据类型：{{ item.customerJson.dataType }}
                 </p>
                 <p v-if="item.customerJson.type == 3">
                   数据格式：{{ item.customerJson.dataFormat }}
@@ -243,11 +239,11 @@
               <p style="padding-right: 10px">
                 {{
                   item.customerJson.type == 1
-                    ? "编程需求"
+                    ? "标准数据定制"
                     : item.customerJson.type == 2
-                    ? "专题应用需求"
+                    ? "行业应用定制"
                     : item.customerJson.type == 3
-                    ? "影像图需求"
+                    ? "影像图定制"
                     : item.customerJson.type
                 }}
               </p>
@@ -578,6 +574,7 @@ export default {
           message: "请选择审核结果",
           trigger: "change",
         },
+      },
       listLoading: false,
       times: [], // 时间
       list: [],
@@ -589,6 +586,41 @@ export default {
       selectDataVisible: false, // 选择数据
       companyAccountInfo: {}, // 对公信息
     };
+  },
+  created() {
+    this.listQuery.keywords = this.$route.query.orderNo;
+    this.getList();
+    this.companyInfoByType(); // 获取对公信息
+  },
+  methods: {
+    handleFilter() {
+      this.listQuery.page = 1;
+      this.getList();
+    },
+    handleSizeChange(val) {
+      this.listQuery.limit = val;
+      this.getList();
+    },
+    handleCurrentChange(val) {
+      this.listQuery.page = val;
+      this.getList();
+    },
+    /**
+     * 取消审核
+     */
+    cancel() {
+      this.auditVisible = false;
+    },
+    /**
+     * 对公支付-待审核
+     */
+    handleAudit(row) {
+      this.oneRow = row;
+      this.form = {
+        auditStatus: undefined, // 审核状态： 1、审核通过，2、审核拒绝
+        auditReason: undefined, // 审核理由
+        orderNo: row.orderNo, // 订单号
+      };
       this.auditVisible = true;
     },
     /**
@@ -723,7 +755,7 @@ export default {
     getList() {
       let _this = this;
       this.listLoading = true;
-      if (this.times.length > 0) {
+      if (this.times && this.times.length > 0) {
         this.listQuery.startTime = this.times[0];
         this.listQuery.endTime = this.times[1];
       }
@@ -751,12 +783,14 @@ export default {
               }
               if (iitem.type == 1) {
                 // 标准数据
-                iitem.imageResolutionStr = iitem.detailJson.imageResolution
-                  ? iitem.detailJson.imageResolution.replace(/{/g, "")
-                  : "";
-                iitem.imageResolutionStr = iitem.imageResolutionStr
-                  ? iitem.imageResolutionStr.replace(/}/g, "")
-                  : "";
+                iitem.itemPic =
+                  _this.BASE_API +
+                  "/api/datacenter/web/gtdata/app/unauth/image/" +
+                  iitem.detailJson.thumbnailPath +
+                  "_98_98.jpg";
+                iitem.imageResolutionStr = iitem.detailJson.imageResolution.toString();
+                // iitem.imageResolutionStr = iitem.detailJson.imageResolution?iitem.detailJson.imageResolution.replace(/{/g, ""):''
+                // iitem.imageResolutionStr = iitem.imageResolutionStr?iitem.imageResolutionStr.replace(/}/g, ""):''
               }
             });
           }
@@ -772,93 +806,6 @@ export default {
             );
           }
         });
-      },
-      /**
-       * 选择数据-关闭弹窗
-       */
-      selectDataEvent(e){
-        if(e){
-          this.getList()
-        }
-        this.selectDataVisible = false
-      },
-      /**
-       * 查看
-       */
-      handleSee(row){
-        this.oneRow = row
-        this.orderSendDetailVisible = true;
-      },
-      /**
-       * 发货弹窗关闭
-       */
-      sendEvent(e){
-        if(e){
-          this.getList()
-        }
-        this.sendVisible = false
-      },
-      /**
-       * 开票发货
-       */
-      handleInvoice(row){
-        this.oneRow = row
-        this.title = '发票发货'
-        this.sendVisible = true
-      },
-      /**
-       * 发货
-       */
-      handleSend(row){
-        this.oneRow = row
-        this.title = '订单发货'
-        this.sendVisible = true
-      },
-      /**
-       * 选择数据
-       */
-      handleData(row){
-        this.oneRow = row
-        this.selectDataVisible = true
-      },
-      /**
-       * 商品品牌列表
-       */
-      getList() {
-        let _this = this
-        this.listLoading = true;
-        if(this.times && this.times.length>0){
-          this.listQuery.startTime = this.times[0]
-          this.listQuery.endTime = this.times[1]
-        }
-        getOrderList(this.listQuery).then((response) => {
-          let a = response.data.data
-          a.map(function(item) {
-            if(item.orderItemList){
-              item.orderItemList.map(function(iitem){
-                iitem.detailJson = iitem.detailJson ? JSON.parse(iitem.detailJson) : {}
-                if(iitem.type == 2){ // 影像图库-尺寸
-                 iitem.fileWidth = iitem.detailJson.imageInfoRelationList && iitem.detailJson.imageInfoRelationList.length>0 ? iitem.detailJson.imageInfoRelationList[0].fileWidth:''
-                }
-                if(iitem.type == 3){
-                  // 行业应用-类别
-                  iitem.firstTitle = iitem.detailJson.firstTitle ? iitem.detailJson.firstTitle : ''
-                }
-                if (iitem.type == 1) {
-                  // 标准数据
-                  iitem.itemPic = _this.BASE_API + '/api/datacenter/web/gtdata/app/unauth/image/' + iitem.detailJson.thumbnailPath + '_98_98.jpg'
-                  iitem.imageResolutionStr = iitem.detailJson.imageResolution.toString()
-                  // iitem.imageResolutionStr = iitem.detailJson.imageResolution?iitem.detailJson.imageResolution.replace(/{/g, ""):''
-                  // iitem.imageResolutionStr = iitem.imageResolutionStr?iitem.imageResolutionStr.replace(/}/g, ""):''
-                }
-              })
-            }
-            if(item.customerJson){
-              item.customerJson = JSON.parse(item.customerJson)
-              item.customerJson.startTimeStr = timestamp2DateAuto(item.customerJson.startTime, "yyyy-MM-dd");
-              item.customerJson.endTimeStr = timestamp2DateAuto(item.customerJson.endTime, "yyyy-MM-dd");
-            }
-          })
         _this.list = a;
         _this.total = response.data.totalCount;
         _this.listLoading = false;
@@ -868,7 +815,7 @@ export default {
      * 清空筛选条件
      */
     clear_search() {
-        this.times = []
+      this.times = [];
       this.listQuery = {
         name: undefined, // 商品名称
         page: 1,
@@ -885,7 +832,6 @@ export default {
       this.getList();
     },
   },
-  },
 };
 </script>
 <style lang="scss">
@@ -913,7 +859,9 @@ export default {
     align-items: center;
     height: 45px;
     label {
-      color: #444444;
+      justify-content: center;
+      text-align: center;
+      color: #3f3f3f;
       font-size: 15px;
       font-weight: 600;
       display: flex;