apply-clients 3.5.4-8 → 3.5.4-80

package/src/filiale/gongyi/pc/addMaterialScience.vue

@@ -14,12 +14,13 @@
           <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 v-if="$parent.$parent.mark === 0" 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"
                     @click="$parent.$parent.showFile = !$parent.$parent.showFile">导入</button>
             <a type="button" class="btn btn-info head-but" v-if="$parent.$parent.mark === 0"
@@ -38,6 +39,9 @@
           <td style="text-align: center;">
             <nobr>{{row.f_material_style}}</nobr>
           </td>
+          <td style="text-align: center;">
+          <nobr>{{row.f_material_code}}</nobr>
+        </td>
           <td style="text-align: center;">
             <nobr>{{row.f_material_unit}}</nobr>
           </td>
@@ -51,8 +55,8 @@
             <nobr>{{row. f_back_number}}</nobr>
           </td>
           <td style="text-align: center;">
-            <button type="button" class="button_search button_spacing" @click="$parent.$parent.updateMaterial($index,row)">修改</button>
-            <button type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(row)">删除</button>
+            <button v-if="$parent.$parent.mark === 0" type="button" class="button_search button_spacing" @click="$parent.$parent.updateMaterial($index,row)">修改</button>
+            <button v-if="$parent.$parent.mark === 0" type="button" class="button_delete button_spacing" @click="$parent.$parent.deleteMaterial(row)">删除</button>
           </td>
         </tr>
       </template>
@@ -93,7 +97,7 @@
                 :value.sync="item.material"
                 v-model="item.material"
                 :options="meterialOptions"
-                :disable="mark === 1"
+                :disable="mark===1"
                 @change="modifyOtherValue(i)"
                 :valueSingle="true"></input-select>
             </div>
@@ -103,6 +107,7 @@
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="text"
                      placeholder="材料名称"
+                     :readonly="enable"
                      v-model="item.f_material_name"
                      :value="item.f_material_name"
               />
@@ -113,16 +118,29 @@
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="text"
                      placeholder="材料型号"
+                     :readonly="enable"
                      v-model="item.f_material_style"
                      :value="item.f_material_style"
               />
             </div>
           </div>
+          <div class="form-group col-sm-6" :class="[item.f_material_code ? '' : '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="材料编码"
+                     :readonly="enable"
+                     v-model="item.f_material_code"
+                     :value="item.f_material_code"
+              />
+            </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">
               <input class="form-control input_view" style="" type="text"
                      placeholder="材料单位"
+                     :readonly="enable"
                      v-model="item.f_material_unit"
                      :value="item.f_material_unit"
               />
@@ -143,6 +161,7 @@
             <div class="col-sm-8">
               <input class="form-control input_view" style="" type="number"
                      placeholder="使用数量"
+                     :readonly="enable"
                      v-model="item.f_use_number"
                      :value="item.f_use_number"
               />
@@ -155,6 +174,7 @@
               <input class="form-control input_view" style="" type="number"
                      placeholder="退库数量"
                      v-model="item.f_back_number"
+                     :readonly="enable"
                      :value.sync="item.f_back_number"
               />
             </div>
@@ -165,6 +185,7 @@
               <input class="form-control input_view" style=""
                      placeholder="材料标识"
                      v-model="item.f_material_code"
+                     :readonly="enable"
                      :value.sync="item.f_material_code"
               />
             </div>
@@ -199,6 +220,7 @@
     },
     data () {
       return {
+        enable:false,
         showMaterial: false,
         showFile: false,
         Rematerials:[
@@ -248,6 +270,9 @@
     },
     ready(){
       this.getOnetoManyData()
+      if(this.selectdata.defname==="材料用量审核"){
+        this.enable = true
+      }
     },
     methods: {
        ReturnInventory(row) {
@@ -357,7 +382,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.parname}-${item.f_material_name}-${item.f_material_style}`,
             'value': item
           }
         })
@@ -379,6 +404,17 @@
       async addMaterial () {
         console.log("登录信息：",this.$login.f)
         this.title = '新增'
+        //自动计算退库数量
+        for (let i = 0; i < this.materials.length; i++) {
+          if(this.materials[i].f_material_number===''||this.materials[i].f_material_number==null){
+            this.$showAlert(`${this.materials[i].f_material_name}未填写数量`, 'warning', 3000)
+            return
+          }
+          if(this.materials[i].f_use_number===''||this.materials[i].f_use_number==null){
+            this.materials[i].f_use_number=0
+          }
+          this.materials[i].f_back_number =Number(this.materials[i].f_material_number)-Number(this.materials[i].f_use_number)
+        }
         let data = {
           f_process_id : this.selectdata.f_process_id,
           f_operator_id: this.$login.f.id,
@@ -438,8 +474,8 @@
       },
       async updateConfirm () {
         let data = this.row
-        data.f_back_number = this.materials[0].f_back_number
-        data.f_use_number = this.materials[0].f_use_number
+        data.f_use_number = this.materials[0].f_use_number==''?0:this.materials[0].f_use_number
+        data.f_back_number = Number(data.f_material_number)-Number(data.f_use_number)
         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