apply-clients 3.2.51 → 3.2.53

package/src/components/product/Apply/Supervisory/SupervisoryhCart.vue

@@ -1,5 +1,5 @@
 <template>
-    <div style="overflow: auto;background-color: #FFFFFF">
+    <div style="overflow: auto;background-color: #FFFFFF; height: 85%;">
       <div class="row" v-for="(i,row) in defnames">
         <div :class="row.id === selectdata.actid ? 'item selectIndex' : 'item'" @click="getdefname(row)" >
           {{row.defname}}

package/src/components/product/Ledger/ContractManagement/PurchaseContract/PurchaseContractInformation.vue

@@ -410,6 +410,7 @@ export default {
       showModal: false,
       material: {},
       getfield: {
+        'f_material_coding':'材料编码',
         'f_material_name': '材料名称',
         'f_material_model': '材料型号',
         'f_material_norm': '材料规格',

package/src/components/product/Ledger/MaterialManagement/InventoryInformation/PurchaseMaterial.vue

@@ -324,7 +324,7 @@ export default {
     // 获取有效采购单
     async getPurchaseOrder () {
       let data = {
-        condition: `po.f_status = '有效'`,
+        condition: `po.f_status = '有效' and f_lump_sum != f_actual_money`,
         data: {
           orgid: this.$login.f.orgid
         }

package/src/components/product/Ledger/MaterialManagement/InventoryInformation/PurchaseOrder.vue

@@ -88,6 +88,26 @@
             </div>
           </div>
 
+          <div class="col-sm-4 form-group item" :class="[$v.f_price_without_tax.required ? 'has-error' : '']">
+            <label class="control-label-justify control-label col-sm-6">不含税价款</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" style=""
+                     type="text" v-validate:f_price_without_tax = "['required']"
+                     v-model="model.f_price_without_tax"
+                     :value="model.f_price_without_tax"
+              />
+            </div>
+          </div>
+          <div class="col-sm-4 form-group item" :class="[$v.f_vat_tax.required ? 'has-error' : '']">
+            <label class="control-label-justify control-label col-sm-6">增值税税款</label>
+            <div class="col-sm-6">
+              <input class="form-control input_view" style=""
+                     type="text" v-validate:f_vat_tax = "['required']"
+                     v-model="model.f_vat_tax"
+                     :value="model.f_vat_tax"
+              />
+            </div>
+          </div>
           <div class="col-sm-12">
             <data-grid :model="model" partial='list' v-ref:grid style="overflow: auto" class="list_area table_sy">
               <template partial='head'>
@@ -279,7 +299,10 @@ export default {
         {resolveMsg: null, rejectMsg: '订单编号查询失败！！！'}
       )
 
-      if (res.data.length > 0) {
+      /*console.dir(res)*/
+
+      if (res.data.length > 0 && res.data[0].f_status != '作废') {
+        console.log('订单状态：'+res.data[0].f_status)
         this.$showAlert('订单编号已存在！！！', 'warning', 3000)
         this.model.f_order_number = null
         return

package/src/components/product/Ledger/MaterialManagement/PurchaseRecords/PrintPurchaseOrder.vue

@@ -75,7 +75,10 @@
         <td></td>
       </tr>
       <tr>
-        <td colspan="10" style="text-align: left;padding-left: 10px">总金额（大写）：{{ smalltoBIG(material.lumpsum) }} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp;总金额（小写）： {{material.lumpsum}}元</td>
+        <td colspan="11" style="text-align: left;padding-left: 10px">总金额（大写）：{{ smalltoBIG(material.lumpsum) }} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp;总金额（小写）： {{material.lumpsum}}元</td>
+      </tr>
+      <tr>
+        <td colspan="11" style="text-align: right;padding-left: 10px">不含税价款：{{ purchaseRecords.f_price_without_tax }}元 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;&nbsp;&nbsp; &nbsp; &nbsp; &nbsp;增值税税款： {{purchaseRecords.f_vat_tax}}元</td>
       </tr>
     </table>
     <p class="space-between">

package/src/components/product/Ledger/MaterialManagement/PurchaseRecords/PurchaseRecordsInformation.vue

@@ -83,6 +83,24 @@
                    :value="purchaseRecords.f_actual_money"/>
           </div>
         </div>
+        <div class="col-sm-4 form-group item">
+          <label class="control-label-justify control-label col-sm-6">不含税价款</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" style=""
+                   type="text" readonly
+                   v-model="purchaseRecords.f_price_without_tax"
+                   :value="purchaseRecords.f_price_without_tax"/>
+          </div>
+        </div>
+        <div class="col-sm-4 form-group item">
+          <label class="control-label-justify control-label col-sm-6">增值税税款</label>
+          <div class="col-sm-6">
+            <input class="form-control input_view" style=""
+                   type="text" readonly
+                   v-model="purchaseRecords.f_vat_tax"
+                   :value="purchaseRecords.f_vat_tax"/>
+          </div>
+        </div>
         <div class="col-sm-4 form-group item">
           <label class="control-label-justify control-label col-sm-6">订单状态</label>
           <div class="col-sm-6">
@@ -181,8 +199,10 @@ export default {
     async showPrintModal(){
       this.model.selectPrint = this.$refs.grid.getRowData()
       this.model.selectPrint.lumpsum= 0
+      this.model.selectPrint.nolumpsum= 0
+      this.model.selectPrint.cenglumpsum =0
       for (var i=0;i<this.model.selectPrint.length;i++){
-        this.model.selectPrint.lumpsum =this.model.selectPrint.lumpsum + this.model.selectPrint[i].f_actual_money
+        this.model.selectPrint.lumpsum =this.model.selectPrint.lumpsum + this.model.selectPrint[i].f_forecast_money
       }
       this.model.selectPrint.lumpsum=this.model.selectPrint.lumpsum.toFixed(2)
       this.showPrint = true

package/src/components/product/Ledger/MaterialManagement/PurchaseRecords/PurchaseRecordsList.vue

@@ -39,7 +39,7 @@
                         :value.sync="model.startDate"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true"
-                        condition="op.f_invoicing_date >= '{}'">
+                        condition="po.f_invoicing_date >= '{}'">
             </datepicker>
           </div>
           <div class="form-group col-sm-3">
@@ -50,7 +50,7 @@
                         :value.sync="model.endDate"
                         :format="'yyyy-MM-dd HH:mm:ss'"
                         :show-reset-button="true"
-                        condition="op.f_invoicing_date <= '{}'">
+                        condition="po.f_invoicing_date <= '{}'">
             </datepicker>
           </div>
         </div>