浏览代码

【修改】bug

howie 2 年之前
父节点
当前提交
5a494ca898

+ 4 - 3
src/views/deposit_commerce/components/deposit_list-detail.vue

@@ -76,10 +76,10 @@
               <div class="label">工程差价总额</div>
               <div class="value">{{ details.depositDiffAmount }}</div>
             </el-col>
-                 <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
-              <div class="label">格力备注</div>
+            <el-col :xs="24" :sm="24" :lg="24" class="item" v-if="!isCustomer">
+              <div class="label">格力内部备注</div>
               <div class="value">
-                 <el-input  v-model=" details.geLiInerNote" placeholder="格力备注" ></el-input>
+                <el-input v-model=" details.geLiInerNote" placeholder="格力内部备注"></el-input>
               </div>
             </el-col>
             <el-col :xs="24" :sm="24" :lg="12" class="item">
@@ -97,6 +97,7 @@
                   <el-date-picker
                     v-model="details.installDate"
                     type="datetime"
+                    :disabled="details.examineStatus == 'OK'"
                     placeholder="安装时间"
                     default-time="00:00:00"
                     value-format="yyyy-MM-dd HH:mm:ss"

+ 1 - 0
src/views/deposit_home/components/deposit_list-detail.vue

@@ -96,6 +96,7 @@
                 <el-form-item prop="installDate">
                   <el-date-picker
                     v-model="details.installDate"
+                    :disabled="details.examineStatus == 'OK'"
                     type="datetime"
                     placeholder="安装时间"
                     default-time="00:00:00"

+ 40 - 1
src/views/supply/deliver/sum_list.vue

@@ -193,7 +193,26 @@
                 </el-date-picker>
               </el-form-item>
             </el-col>
-            <el-col :xs="24" :sm="24" :lg="6" class="tr">
+            <el-col :xs="24" :sm="12" :lg="6">
+              <el-form-item label="申请发货单类型" prop="types">
+                <el-select
+                  v-model="screenForm.types"
+                  placeholder="选择申请发货单类型"
+                  clearable
+                  filterable
+                  style="width: 100%"
+                >
+                  <el-option
+                    v-for="item in invoiceList"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value"
+                  >
+                  </el-option>
+                </el-select>
+              </el-form-item>
+            </el-col>
+            <el-col :xs="24" :sm="24" :lg="24" class="tr">
               <el-form-item label="">
                 <el-button @click="resetScreenForm">清空</el-button>
                 <el-button type="primary" @click="submitScreenForm"
@@ -856,7 +875,22 @@ export default {
         k3ServiceId: "",
         mainOrderId: "",
         approvaTime: "",
+        types:''
       },
+      invoiceList:[
+        {
+          value:1,
+          label:'申请发货单'
+        },
+        {
+          value:2,
+          label:'退货单'
+        },
+        {
+          value:3,
+          label:'直调发货单'
+        }
+      ],
       categoryList: [],
       salesmanList: [],
       tableSelection: [],
@@ -908,6 +942,7 @@ export default {
           ? this.screenForm.approvaTime[0]
           : "",
         correspondId: this.screenForm.correspondId.join(","),
+        type:this.screenForm.types
       };
     },
     comRefundableQty() {
@@ -1019,6 +1054,8 @@ export default {
           ? this.screenForm.approvaTime[0]
           : "",
         correspondId: this.screenForm.correspondId.join(","),
+        type:this.screenForm.types
+
       };
 
       getSumList(params).then((res) => {
@@ -1073,6 +1110,8 @@ export default {
           ? this.screenForm.approvaTime[0]
           : "",
         correspondId: this.screenForm.correspondId.join(","),
+        type:this.screenForm.types
+
       };
       getListInvoiceNumber(params).then((res) => {
         // console.log(res,'ii');

+ 8 - 1
src/views/supply/retail/components/retail_detail.vue

@@ -165,7 +165,7 @@
     </div>
 
     <el-dialog title="直调发货" :visible.sync="isShowDeliverDialog" width="80%">
-      <el-form ref="deliverForm" :model="deliverForm" :rules="deliverFormRules" label-width="80px" size="small" label-position="left">
+      <el-form ref="deliverForm" :model="deliverForm" :rules="deliverFormRules" label-width="120px" size="small" label-position="left">
         <el-row :gutter="20">
           <el-col :xs="8" :sm="8" :lg="8" style="height: 51px;">
             <el-form-item label="发货日期" prop="date">
@@ -186,6 +186,11 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :xs="8" :sm="8" :lg="8">
+            <el-form-item label="发货申请备注" prop="remark">
+              <el-input v-model="deliverForm.remark" placeholder="请输入发货申请备注"  clearable ></el-input>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
 
@@ -337,6 +342,7 @@ export default {
       deliverForm: {
         date: '',
         position: '',
+        remark:''
       },
       deliverFormRules: {
         date: [
@@ -495,6 +501,7 @@ export default {
           let params = {
             orderNo: this.listItem.id,
             orderDate: this.deliverForm.date + ' 00:00:00',
+            remark:this.deliverForm.remark,
             correspondId: this.deliverForm.position,
             directItems: goodsList
           }