apply-clients 3.4.21 → 3.4.23

package/src/filiale/guangxi/pc/Process/Service/addMaterialScience.vue

@@ -5,11 +5,11 @@
         <tr>
           <th class="textNoLineBreak">序号</th>
           <th class="textNoLineBreak">材料名称</th>
-          <th class="textNoLineBreak">材料型号</th>
           <th class="textNoLineBreak">材料单位</th>
+          <th class="textNoLineBreak">材料单价</th>
           <th class="textNoLineBreak">材料数量</th>
-          <th class="textNoLineBreak">材料编号</th>
-          <th class="textNoLineBreak">材料标识</th>
+          <th class="textNoLineBreak">材料金额</th>
+          <th class="textNoLineBreak">材料备注</th>
           <th class="textNoLineBreak">
             <button class="button_new button_spacing" type="button" @click="$parent.$parent.openMaterialModal()">添加</button>
             <button type="button" class="btn btn-info head-but" v-if="$parent.$parent.mark === 0"
@@ -28,19 +28,19 @@
             <nobr>{{row.f_material_name}}</nobr>
           </td>
           <td style="text-align: center;">
-            <nobr>{{row.f_material_style}}</nobr>
+            <nobr>{{row.f_material_unit}}</nobr>
           </td>
           <td style="text-align: center;">
-            <nobr>{{row.f_material_unit}}</nobr>
+            <nobr>{{row.f_material_price}}</nobr>
           </td>
           <td style="text-align: center;">
             <nobr>{{row.f_material_number}}</nobr>
           </td>
           <td style="text-align: center;">
-            <nobr>{{row.f_bjq_sid}}</nobr>
+            <nobr>{{row.f_material_money}}</nobr>
           </td>
           <td style="text-align: center;">
-            <nobr>{{row.f_material_code}}</nobr>
+            <nobr>{{row.f_material_remarks}}</nobr>
           </td>
           <td style="text-align: center;">
             <button type="button" class="button_search button_spacing" @click="$parent.$parent.updateMaterial($index,row)">修改</button>
@@ -100,16 +100,6 @@
               />
             </div>
           </div>
-          <div class="form-group col-sm-6" :class="[item.f_material_style ? '' : 'has-error']">
-            <label class="col-sm-4 control-label">材料型号：</label>
-            <div class="col-sm-8">
-              <input class="form-control input_view" style="" type="text"
-                     placeholder="材料型号"
-                     v-model="item.f_material_style"
-                     :value="item.f_material_style"
-              />
-            </div>
-          </div>
           <div class="form-group col-sm-6" :class="[item.f_material_unit ? '' : 'has-error']">
             <label class="col-sm-4 control-label">材料单位：</label>
             <div class="col-sm-8">
@@ -120,6 +110,16 @@
               />
             </div>
           </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_price ? '' : 'has-error']">
+            <label class="col-sm-4 control-label">材料单价：</label>
+            <div class="col-sm-8">
+              <input class="form-control input_view" style="" type="text"
+                     placeholder="材料单价"
+                     v-model="item.f_material_price"
+                     :value="item.f_material_price"
+              />
+            </div>
+          </div>
           <div class="form-group col-sm-6" :class="[item.f_material_number ? '' : 'has-error']">
             <label class="col-sm-4 control-label">材料数量：</label>
             <div class="col-sm-8">
@@ -131,22 +131,22 @@
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">材料编号：</label>
+            <label class="col-sm-4 control-label">材料金额：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="text"
-                     placeholder="材料编号"
-                     v-model="item.f_bjq_sid"
-                     :value="item.f_bjq_sid"
+                     placeholder="材料金额"
+                     v-model="item.f_material_money"
+                     :value="item.f_material_money"
               />
             </div>
           </div>
           <div class="form-group col-sm-6">
-            <label class="col-sm-4 control-label">材料标识：</label>
+            <label class="col-sm-4 control-label">材料备注：</label>
             <div class="col-sm-8">
               <input class="form-control input_view" style=""
-                     placeholder="材料标识"
-                     v-model="item.f_material_code"
-                     :value.sync="item.f_material_code"
+                     placeholder="材料备注"
+                     v-model="item.f_material_remarks"
+                     :value.sync="item.f_material_remarks"
               />
             </div>
           </div>
@@ -190,12 +190,11 @@
           {
             material:'',
             f_material_name:'',
-            f_material_style:'',
             f_material_unit:'',
+            f_material_price:'',
             f_material_number:'',
-            f_bjq_sid:'',
-            f_material_code:'',
-            f_userinfo_code:''
+            f_material_money:'',
+            f_material_remarks:''
           }
         ],
         meterialOptions:[],
@@ -209,7 +208,7 @@
     methods: {
       async getOnetoManyData () {
         let data = {
-          tablename: `t_material_apply`,
+          tablename: `t_material_detail`,
           condition: `f_process_id='${this.selectdata.f_process_id}'`
         }
         let res = await this.$resetpost(
@@ -226,12 +225,11 @@
           {
             material:'',
             f_material_name:'',
-            f_material_style:'',
             f_material_unit:'',
+            f_material_price:'',
             f_material_number:'',
-            f_bjq_sid:'',
-            f_material_code:'',
-            f_userinfo_code:''
+            f_material_money:'',
+            f_material_remarks:''
           }
         ],
         this.showMaterialModal = true
@@ -250,11 +248,11 @@
         this.materials.push({
           material:'',
           f_material_name:'',
-          f_material_style:'',
           f_material_unit:'',
+          f_material_price:'',
           f_material_number:'',
-          f_bjq_sid:'',
-          f_material_code:'',
+          f_material_money:'',
+          f_material_remarks:''
         })
       },
       // 获取模态框材料
@@ -272,7 +270,7 @@
 
         this.meterialOptions = res.data.map(item => {
           return {
-            'label': `${item.f_material_name}--${item.f_material_style}--${item.f_material_unit}--${item.f_material_code}`,
+            'label': `${item.f_material_name}--${item.f_material_unit}--${item.f_material_price}`,
             'value': item
           }
         })
@@ -282,19 +280,21 @@
         console.log("dddd",this.materials[index].material)
         let material = this.materials[index].material
         this.materials[index].f_material_name = material.f_material_name
-        this.materials[index].f_material_style = material.f_material_style
         this.materials[index].f_material_unit = material.f_material_unit
+        this.materials[index].f_material_price = material.f_material_price
         this.materials[index].f_material_number = material.f_material_number
-        this.materials[index].f_material_code = material.f_material_code
+        this.materials[index].f_material_money = material.f_material_money
       },
       // 新增材料
       async addMaterial () {
         console.log("登录信息：",this.$login.f)
         this.title = '新增'
         let data = {
+          selectdata:this.selectdata,
           f_process_id : this.selectdata.f_process_id,
           f_operator_id: this.$login.f.id,
           f_operator: this.$login.f.name,
+          f_department_name:this.$login.f.f_department_name,
           f_operation_date: new Date().Format('yyyy-MM-dd HH:mm:ss'),
           f_orgid: this.$login.f.orgid,
           f_orgname: this.$login.f.orgs,
@@ -310,6 +310,31 @@
           `rs/logic/saveMaterials`,
           data
         )
+        debugger
+   // if(res.data == 200){
+   //   let money = 0;
+   //   for(var i=0;i<this.materials.length; i++){
+   //     money +=this.materials[i].f_material_money
+   //   }
+   //   this.selectdata.f_contract_money += money
+   //   console.log('打印this.materials.f_contract_money',money)
+   //   let contractbu={
+   //     f_contract_money:money,
+   //     f_contract_type:'材料合同'
+   //   }
+   //   let data ={
+   //     contract:contractbu,
+   //     selectdata: this.selectdata,
+   //     user: this.$login.f,
+   //   }
+   //   let http1 = new HttpResetClass()
+   //   let res = await http1.load(
+   //     'POST',
+   //     `rs/logic/saveReplenishContract`,
+   //     {data: data},
+   //     {resolveMsg: null, rejectMsg: '补充协议成功！！！'}
+   //   )
+   // }
         this.closeMaterials()
       },
       async deleteMaterial (row) {
@@ -337,11 +362,11 @@
           {
             material:'',
             f_material_name:row.f_material_name,
-            f_material_style:row.f_material_style,
             f_material_unit:row.f_material_unit,
+            f_material_price:row.f_material_price,
             f_material_number:row.f_material_number,
-            f_material_code:row.f_material_code,
-            f_bjq_sid: row.f_bjq_sid
+            f_material_money:row.f_material_money,
+            f_material_remarks: row.f_material_remarks
           }
         ]
         this.showMaterialModal = true
@@ -349,18 +374,18 @@
       async updateConfirm () {
         let data = this.row
         data.f_material_name = this.materials[0].f_material_name
-        data.f_material_style = this.materials[0].f_material_style
         data.f_material_unit = this.materials[0].f_material_unit
+        data.f_material_price = this.materials[0].f_material_price
         data.f_material_number = this.materials[0].f_material_number
-        data.f_material_code = this.materials[0].f_material_code
-        data.f_bjq_sid = this.materials[0].f_bjq_sid
+        data.f_material_money = this.materials[0].f_material_money
+        data.f_material_remarks = this.materials[0].f_material_remarks
         //报警器流程 设备编号检验
         await this.bjqCheck()
         if (this.bjqChecklag.length > 0){
           return
         }
         let res = await this.$resetpost(
-          `rs/entity/t_material_apply`,
+          `rs/entity/t_material_detail`,
           data
         )
         this.closeMaterials()

package/src/filiale/guangxi/pc.js

@@ -6,6 +6,7 @@ let specialComp = {
   'supervisory-service-control': (resolve) => { require(['./pc/Process/Service/SupervisoryServiceControl'], resolve) },
   'service-control': (resolve) => { require(['./pc/Process/Service/ServiceControl'], resolve) },
   'apply-charge-list': (resolve) => { require(['./pc/ApplyCharge/ApplyChargeList'], resolve) },
+  'apply-charge-management': (resolve) => { require(['./pc/ApplyCharge/chargeManagement'], resolve) },
   'apply-charge-search': (resolve) => { require(['./pc/ApplyCharge/ApplyChargeSearch'], resolve) },
   'add-material-science': (resolve) => { require(['./pc/Process/Service/addMaterialScience'], resolve) }
 

package/src/main.js

@@ -8,11 +8,11 @@ import {material} from 'material-client'
 
 import apply from './apply'
 
-// import applyAndroid from './applyAndroid'
+import applyAndroid from './applyAndroid'
 
 all()
-apply('guangxi')
-// applyAndroid('guangxi')
+// apply('guangxi')
+applyAndroid('guangxi')
 ldap()
 sale()
 material()