Browse Source

添加订单审核 审核备注

mo 4 years ago
parent
commit
60a01379e7

File diff suppressed because it is too large
+ 0 - 0
dist/index.html


+ 1 - 0
dist/static/css/chunk-54cb32b4.3cb329b6.css

@@ -0,0 +1 @@
+.lookTitle[data-v-5db2f604]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-5db2f604]{display:inline-block}

+ 0 - 1
dist/static/css/chunk-74fdf3e3.69c7a1c3.css

@@ -1 +0,0 @@
-.lookTitle[data-v-6bdf106a]{height:40px;line-height:40px;font-weight:700;background-color:#edeef0;padding:0 20px;margin-bottom:20px}.setWidth[data-v-6bdf106a]{display:inline-block}

File diff suppressed because it is too large
+ 0 - 0
dist/static/js/app.c810f0a3.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-54cb32b4.002712d5.js


File diff suppressed because it is too large
+ 0 - 0
dist/static/js/chunk-74fdf3e3.26907db6.js


+ 2 - 2
src/views/businessManager/orderManager/orderAudit/index.vue

@@ -76,13 +76,13 @@
           <el-table-column align="center"
                            prop="saleAmount"
                            label="销售收入"></el-table-column>
-          <el-table-column align="center"
+          <!-- <el-table-column align="center"
                            prop="memo"
                            label="备注">
             <template slot-scope="scope">
               <Tooltip :content="scope.row.memo?scope.row.memo:''" />
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column align="center"
                            prop="operator.username"
                            label="申请人"></el-table-column>

+ 14 - 3
src/views/businessManager/orderManager/orderAudit/orderAuditDetail.vue

@@ -156,7 +156,7 @@
         </div>
       </div>
       <div class="lookTitle">其它</div>
-      <el-form-item label="备注"
+      <el-form-item label="提交备注"
                     :label-width="formLabelWidth">
         <el-input placeholder="请输入备注"
                   :disabled="!isAdd"
@@ -164,6 +164,15 @@
                   type="textarea"
                   :rows="3"></el-input>
       </el-form-item>
+      <el-form-item label="审核备注"
+                    v-if="auditStatus != 'ING'"
+                    :label-width="formLabelWidth">
+        <el-input placeholder="请输入备注"
+                  :disabled="!isAdd"
+                  v-model.trim="form.auditComment"
+                  type="textarea"
+                  :rows="3"></el-input>
+      </el-form-item>
 
     </el-form>
     <div class="lookTitle"
@@ -204,7 +213,8 @@ export default {
           number: null
         }],
         applyType: null,
-        userId: ''
+        userId: '',
+        auditComment: ''
       },
       isAdd: false,
       cooperationList: [],
@@ -232,7 +242,8 @@ export default {
             serviceAmount: orderInfo.serviceAmount,
             saleAmount: orderInfo.saleAmount,
             schoolId: orderInfo.schoolId,
-            userId: orderInfo.userId
+            userId: orderInfo.userId,
+            auditComment: orderInfo.auditComment
           }
           this.auditStatus = orderInfo.auditStatus
           this.$set(this.form, 'goodsList', this.getShopList(orderInfo.goodsJson))

Some files were not shown because too many files changed in this diff