Finish Hotfix-zh-276

src/mixin/print.js

@@ -319,6 +319,8 @@ export default {
           printNum: printNum + 1,
           salesId: salesOrderId,
           invoiceId: invoiceId,
+          refUseUnit:data.refUseUnit||'',
+          refEnginRecordNo:data.refEnginRecordNo||'',
           type: data.type,
           tiTui: data.type === 2 ? `退货人` : `提货人`,
           takerPhone: data.takerPhone || "",

src/utils/panel.js

@@ -8,7 +8,7 @@ export default {
     "printElements": [{
       "options": {
         "left": 0,
-        "top": 25,
+        "top": 15,
         "height": 27,
         "width": 656,
         "field": "company",
@@ -118,11 +118,39 @@ export default {
         "textAlign": "left"
       }, "printElementType": { "title": "", "type": "text" }
     },
-    {
+    , {
       "options": {
         "left": 40,
         "top": 110,
         "height": 13,
+        "width": 328,
+        "fontSize": 12.5,
+        "title": "工程登录编号",
+        "fontFamily": '黑体,宋体,微软雅黑',
+        "field": "refEnginRecordNo",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 348,
+        "top": 110,
+        "height": 13,
+        "width": 328,
+        "fontSize": 12.5,
+        "title": "使用单位",
+        "fontFamily": '黑体,宋体,微软雅黑',
+        "field": "refUseUnit",
+        "color": "#000",
+        "textAlign": "left"
+      }, "printElementType": { "title": "", "type": "text" }
+    },
+    {
+      "options": {
+        "left": 40,
+        "top": 130,
+        "height": 13,
         "width": 633,
         "fontSize": 12.5,
         "title": "备注",
@@ -136,7 +164,7 @@ export default {
     {
       "options": {
         "left": 23,
-        "top": 125,
+        "top": 145,
         "height": 410,
         "width": 633,
         "fontSize": 12.5,

src/views/supply/pickup/components/pickup_form.vue

@@ -22,6 +22,7 @@
                 v-model="mainForm.warehouse"
                 placeholder="请选择仓库"
                 style="width: 100%"
+                :disabled="listItem.flag"
               >
                 <el-option
                   :label="item.name"
@@ -33,7 +34,7 @@
             </el-form-item>
           </el-col>
           <el-col :xs="24" :sm="12" :lg="8">
-            <el-button size="small" type="primary" @click="getDeliverList"
+            <el-button size="small" type="primary"  v-if="!listItem.flag" @click="getDeliverList"
               >确定</el-button
             >
           </el-col>
@@ -42,6 +43,7 @@
           <el-col :xs="24" :sm="12" :lg="8" style="height: 51px">
             <el-form-item label="预约日期" prop="date">
               <el-date-picker
+              :disabled="listItem.flag"
                 v-model="mainForm.date"
                 type="date"
                 value-format="yyyy-MM-dd"
@@ -53,7 +55,7 @@
           </el-col>
           <el-col :xs="24" :sm="12" :lg="12" style="height: 51px">
             <el-form-item label="预约时段" prop="timeSlot">
-              <el-radio-group v-model="mainForm.timeSlot">
+              <el-radio-group v-model="mainForm.timeSlot" :disabled="listItem.flag">
                 <el-radio :label="1">上午</el-radio>
                 <el-radio :label="2">下午</el-radio>
               </el-radio-group>
@@ -63,7 +65,7 @@
         <el-row :gutter="20">
           <el-col :xs="24" :sm="12" :lg="8">
             <el-form-item label="提货方式" prop="pickupWay">
-              <el-radio-group v-model="mainForm.pickupWay">
+              <el-radio-group v-model="mainForm.pickupWay" :disabled="listItem.flag">
                 <el-radio
                   :label="item.dictCode"
                   v-for="(item, index) in pickupWayList"
@@ -78,6 +80,7 @@
               <el-select
                 v-model="mainForm.pickupMan"
                 placeholder="全部"
+                :disabled="listItem.flag"
                 style="width: 100%"
               >
                 <el-option
@@ -95,6 +98,7 @@
                 v-model="mainForm.pickupCar"
                 placeholder="全部"
                 style="width: 100%"
+                :disabled="listItem.flag"
               >
                 <el-option
                   :label="item.carBrand"
@@ -111,6 +115,7 @@
                 v-model="mainForm.company"
                 placeholder="全部"
                 style="width: 100%"
+                :disabled="listItem.flag"
               >
                 <el-option
                   :label="item.logisticsCompany"
@@ -127,6 +132,7 @@
             <el-form-item label="备注内容" prop="remark">
               <el-input
                 v-model="mainForm.remark"
+                :disabled="listItem.flag"
                 placeholder="请输入备注内容"
               ></el-input>
             </el-form-item>
@@ -246,6 +252,7 @@
         <el-button
           type="primary"
           @click="clickSubmitForm"
+          v-if="!listItem.flag"
           :loading="formLoading"
           >{{ formLoading ? "提交中 ..." : "提 交" }}</el-button
         >

src/views/supply/pickup/pickup_list.vue

@@ -294,6 +294,11 @@
               <template slot-scope="scope">
                 <el-button
                   type="text"
+                  @click="toForm(scope.row,true)"
+                  >详情</el-button
+                >
+                <el-button
+                  type="text"
                   @click="toForm(scope.row)"
                   v-if="
                     $checkBtnRole('edit', $route.meta.roles) &&
@@ -449,7 +454,8 @@ export default {
     },
 
     // 进入表单
-    toForm(item) {
+    toForm(item,flag) {
+      item.flag = flag // 详情 flag 为 details
       this.queryItem = item;
       this.isShowForm = true;
     },