소스 검색

'修改下单制'

魏志佳 4 년 전
부모
커밋
a471907ca4
4개의 변경된 파일37개의 추가작업 그리고 33개의 파일을 삭제
  1. 1 1
      src/views/modules/workBench/materialList.vue
  2. 32 28
      src/views/modules/workBench/orderDetail.vue
  3. 2 2
      src/views/modules/workBench/placeOrder.vue
  4. 2 2
      vue.config.js

+ 1 - 1
src/views/modules/workBench/materialList.vue

@@ -556,7 +556,7 @@
                                         <a-textarea
                                             placeholder="请输入描述"
                                             v-decorator="[
-                                            'materialDescribe', // 给表单赋值或拉取表单时,该input对应的key
+                                            'description', // 给表单赋值或拉取表单时,该input对应的key
                                             ]"
                                             :auto-size="{ minRows: 3, maxRows: 10 }"
                                         />

+ 32 - 28
src/views/modules/workBench/orderDetail.vue

@@ -498,12 +498,12 @@
                 </div>
                 <!-- 素材列表 -->
                 <div class="section-item" v-if="currentOrderInfo.orderStatus==1||currentOrderInfo.orderStatus==3">
-                    <div class="tabBox">
+                    <!-- <div class="tabBox">
                         <a-tabs v-model="tabKey" @change="tabChange">
                             <a-tab-pane :key='1' tab="真人物料"></a-tab-pane>
                             <a-tab-pane :key='2' tab="剪辑物料"></a-tab-pane>
                         </a-tabs>
-                    </div>
+                    </div> -->
                         
                     
                     <div class="section-box">
@@ -588,7 +588,7 @@
                                             :multiple="false"
                                         />
                                         <span v-if="repeat" style="color: red">此素材重复,请重新选择上传</span>
-                                        <span v-if="confirmLoading && videoinfo.url != ''" style="color: green">上传成功</span>
+                                        <span v-if="confirmLoading && urlList.url != ''" style="color: green">上传成功</span>
                                     </a-form-item>
                                     <a-form-item
                                         label="封面上传"
@@ -708,7 +708,7 @@
                                         <a-textarea
                                             placeholder="请输入描述"
                                             v-decorator="[
-                                            'describe', // 给表单赋值或拉取表单时,该input对应的key
+                                            'description', // 给表单赋值或拉取表单时,该input对应的key
                                             ]"
                                             :auto-size="{ minRows: 3, maxRows: 10 }"
                                         />
@@ -1633,9 +1633,10 @@ export default {
                 console.log(res);
                 this.data=[]
                 if(res.success){
-                    this.data=res.result.list.filter(item=>item.materialType==this.tabKey);
-                    // this.ipagination.total=res.result.total
-                    this.ipagination.total=this.data.length
+                    this.data=res.result.list;
+                    // this.data=res.result.list.filter(item=>item.materialType==this.tabKey);
+                    this.ipagination.total=res.result.total
+                    // this.ipagination.total=this.data.length
                     this.loading=false
                 }
             })
@@ -1817,30 +1818,29 @@ export default {
         // 请求order详情数据
         orderDetailHttp(){
             this.pageSpinning=true;
+            this.currentOrderInfo={}
             getAction(this.url.orderDetail,{
                 id:this.currentOrderId
             }).then(res=>{
                 console.log(res)
                 this.pageSpinning=false;
-                this.currentOrderInfo={}
                 if(res.success){
                     this.currentOrderInfo=res.result;
-                    if(res.result.orderStatus){
-                        switch(res.result.orderStatus){
-                            case 0:
-                                this.currentStep=1;
-                                break
-                            case 1:
-                                this.currentStep=2;
-                                break
-                            case 2:
-                                this.currentStep=0;
-                                break
-                            case 3:
-                                this.currentStep=3;
-                                break
+                    // res.result.orderStatus
+                    console.log(this.currentOrderInfo.orderStatus)
+                    if(this.currentOrderInfo.orderStatus || this.currentOrderInfo.orderStatus==0){
+                        if(this.currentOrderInfo.orderStatus==0){
+                            this.currentStep=1;
+                        }else if(this.currentOrderInfo.orderStatus==1){
+                            this.currentStep=2;
+                        }else if(this.currentOrderInfo.orderStatus==2){
+                            this.currentStep=0;
+                        }else if(this.currentOrderInfo.orderStatus==3){
+                            this.currentStep=3;
                         }
+                        
                     }
+                    console.log(this.currentStep)
 
                     this.materialHttp()
                 }
@@ -1873,8 +1873,8 @@ export default {
 
         beforeUpload(file) {
             // this.uploadAction= `http://api.tjyourong.com.cn/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
-            // this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
-            this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            this.uploadAction= `http://192.168.1.43:8088/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
+            // this.uploadAction= `http://139.186.151.174:8804/jeecg-boot/platform/file/uploadScript?materialId=${this.currentMaterial.id}&projectId=${this.currentMaterial.projectId}`
 
             this.loadDisabled = true
             const size = (Number(file.size) / (1024 * 1024)).toFixed(2)
@@ -2397,10 +2397,7 @@ export default {
         // });
 
         this.getTagListAll()
-        
-    },
-    mounted() {
-       let userInfo=localStorage.getItem('pro__Login_Userinfo');
+         let userInfo=localStorage.getItem('pro__Login_Userinfo');
         if(userInfo){
             this.userInfo=JSON.parse(userInfo).value
         }
@@ -2411,6 +2408,13 @@ export default {
         if(this.currentOrderId){
             this.orderDetailHttp()
         } 
+        
+    },
+    mounted() {
+       
+    },
+    destroyed() {
+        this.currentOrderInfo={}
     },
     activated() {
         this.currentOrderId=this.$parent.orderId;

+ 2 - 2
src/views/modules/workBench/placeOrder.vue

@@ -302,7 +302,7 @@
                         <div class="hint-item"></div>
                         <div class="label-item">
                             <div class="text-item">日均产量</div>
-                            <div class="required-item"></div>
+                            <!-- <div class="required-item"></div> -->
                         </div>
                         <div class="input-item"> 
                             <a-form-model-item ref="materialAmountDay"  prop="materialAmountDay">
@@ -475,7 +475,7 @@ export default {
                 // ],
                 dataValue: [{ required: true, message: '请选择订单周期', trigger: 'change' }],
                 materialAmount: [{ required: true, message: '素材总数必须大于1', trigger: 'change' }],
-                materialAmountDay: [{required: true, message: '日均产量必须填写', trigger: 'change' }],
+                // materialAmountDay: [{required: true, message: '日均产量必须填写', trigger: 'change' }],
                 project: [{required: true, message: '请选择关联项目', trigger: 'change' }],
                 design: [{required: true, message: '请选择设计组长', trigger: 'change' }],
                 cutAmount: [

+ 2 - 2
vue.config.js

@@ -73,7 +73,7 @@ module.exports = {
         // target: 'http://192.168.1.188:8088', //请求本地 需要jeecg-boot后台项目  英豪
         // target: 'http://192.168.2.115:8080', //请求本地 需要jeecg-boot后台项目  祚云
         // target: 'http://192.168.1.43:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
-        // target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
+        target: 'http://192.168.1.43:8088', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.43:8087', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.0.252:8098', //请求本地 需要jeecg-boot后台项目  毕洁泉
         // target: 'http://192.168.1.219:8080', //请求本地 需要jeecg-boot后台项目  赵西安
@@ -84,7 +84,7 @@ module.exports = {
         //  target: 'http://adsp.tjyourong.com.cn/', //请求本地 需要jeecg-boot后台项目
         // target: 'http://192.168.1.251/', //请求本地 需要jeecg-boot后台项目
         // target:'http://118.24.244.213:8804',
-        target:'http://139.186.151.174:8804', //测试
+        // target:'http://139.186.151.174:8804', //测试
 
         ws: false,