yusheng 1 år sedan
förälder
incheckning
d0b5b5f891

+ 14 - 0
src/views/purchasingManage/purchaseOrder/invoice/components/detailDialog.vue

@@ -374,6 +374,20 @@
             slot: 'weightUnit',
             align: 'center'
           },
+          {
+            width: 160,
+            prop: 'pricingWay',
+            label: '计价方式',
+            slot: 'pricingWay',
+            align: 'center',
+            formatter: (row, column) => {
+              return row.pricingWay == 1
+                ? '数量'
+                : row.pricingWay == 2
+                ? '重量'
+                : '';
+            }
+          },
           {
             width: 160,
             prop: 'singlePrice',

+ 3 - 25
src/views/saleManage/saleOrder/invoice/components/addInvoiceDialog.vue

@@ -61,33 +61,13 @@
           </el-form-item>
         </el-col>
       </el-row>
+
       <el-row :gutter="12">
-        <el-col :span="12">
-          <el-form-item label="计价方式">
-            <el-select v-model="form.pricingWay" disabled style="width: 100%">
-              <el-option label="按数量计费" :value="1"></el-option>
-              <el-option label="按重量计费" :value="2"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
         <el-col :span="12">
           <el-form-item label="客户电话" prop="linkPhone">
             <el-input clearable v-model="form.linkPhone" placeholder="请输入" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="12">
-        <!-- <el-col :span="12">
-          <el-form-item label="车辆名称" >
-            <el-input clearable readonly @click.native="handleSelectDevice" v-model="form.deviceName"
-                      placeholder="请输入"/>
-          </el-form-item>
-        </el-col> -->
-        <!-- <el-col :span="12">
-          <el-form-item label="车辆号" prop="carNo">
-            <el-input clearable v-model="form.carNo" placeholder="请输入"/>
-          </el-form-item>
-        </el-col> -->
         <el-col :span="12">
           <el-form-item label="收货地址" prop="receiveAddress">
             <el-input
@@ -102,8 +82,6 @@
             <el-input clearable v-model="form.projectName" :disabled="true" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="12">
         <el-col :span="12">
           <el-form-item label="车牌号" prop="carNo">
             <el-select v-model="form.carNo" style="width: 100%">
@@ -121,8 +99,6 @@
             <el-input clearable v-model="form.trayNum" />
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="12">
         <el-col :span="12">
           <el-form-item prop="sendFiles" label="发货附件">
             <fileMain v-model="form.sendFiles"></fileMain>
@@ -134,6 +110,8 @@
           </el-form-item>
         </el-col>
       </el-row>
+    
+
     </el-form>
     <el-tabs v-model="activeName" style="margin-top: 15px" type="border-card">
       <el-tab-pane label="产品清单" name="first">

+ 7 - 25
src/views/saleManage/saleOrder/invoice/components/detailDialog.vue

@@ -49,12 +49,12 @@
             <el-form-item label="客户地址:" prop="partaAddress">
               <el-input v-model="form.partaAddress" disabled></el-input>
             </el-form-item>
-            <el-form-item label="计价方式:">
+            <!-- <el-form-item label="计价方式:">
               <el-select v-model="form.pricingWay" disabled style="width: 100%">
                 <el-option label="按数量计费" :value="1"></el-option>
                 <el-option label="按重量计费" :value="2"></el-option>
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
             <el-form-item label="车牌号:" prop="partaAddress">
               <el-input v-model="form.carNo" disabled></el-input>
             </el-form-item>
@@ -62,30 +62,12 @@
               <el-input v-model="form.trayNum" disabled></el-input>
             </el-form-item>
             <el-form-item label="发货附件:" prop="sendFiles">
-              <fileMain v-model="row.sendFiles" type="view"></fileMain>
-              <!--            <div v-if="detailData.sendFiles && detailData.sendFiles?.length">-->
-              <!--              <el-link-->
-              <!--                v-for="link in detailData.sendFiles"-->
-              <!--                :key="link.id"-->
-              <!--                type="primary"-->
-              <!--                :underline="false"-->
-              <!--                @click="downloadFile(link)"-->
-              <!--              >-->
-              <!--                {{ link.name }}</el-link-->
-              <!--              >-->
-              <!--            </div>-->
+              <fileMain v-model="form.sendFiles" type="view"></fileMain>
+
             </el-form-item>
             <el-form-item label="回执附件:" prop="sendFiles">
-              <fileMain v-model="row.repliedFiles" type="view"></fileMain>
-              <!--            <div v-if="detailData.repliedFiles && detailData.repliedFiles?.length">-->
-              <!--              <el-link-->
-              <!--                v-for="link in detailData.repliedFiles"-->
-              <!--                :key="link.id"-->
-              <!--                type="primary"-->
-              <!--                :underline="false"-->
-              <!--                @click="downloadFile(link)">-->
-              <!--                {{ link.name }}</el-link>-->
-              <!--            </div>-->
+              <fileMain v-model="form.repliedFiles" type="view"></fileMain>
+          
             </el-form-item>
           </el-col>
 
@@ -462,7 +444,7 @@
             slot: 'pricingWay',
             align: 'center',
             formatter: (row, column) => {
-              return row.pricingWay == 1 ? '数量' : '重量';
+              return row.pricingWay == 1 ? '数量' :  row.pricingWay == 2 ? '重量':'';
             }
           },
           {