Merge branch 'dev' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend into dev

src/views/checklistManagement/components/templateAdd.vue

@@ -28,6 +28,7 @@
             </DictSelection>
           </el-form-item>
         </el-col>
+
         <el-col v-if="form.checklistType == '1'" :span="8">
           <el-form-item
             label="是否自动指定模板"
@@ -168,6 +169,98 @@
         </template>
       </ele-pro-table>
 
+      <!-- <header-title title="物品放行规则" v-if="form.checklistType == 3">
+        <el-button type="primary" icon="el-icon-plus" @click="addDetails(1)">
+          添加规则指标
+        </el-button>
+      </header-title>
+
+      <ele-pro-table
+        ref="scTable"
+        row-key="id"
+        :columns="columns"
+        :datasource="scCheckTypeDetails"
+        v-if="form.checklistType == 3"
+      >
+        <template v-slot:businessType="{ row }">
+          <el-select
+            v-model="row.businessType"
+            placeholder="请选择业务类型"
+            @change="businessTypeChange(row)"
+          >
+            <el-option
+              v-for="i in indicatorUseLevelList"
+              :key="i.businessType"
+              :label="i.businessName"
+              :value="i.businessType"
+            >
+            </el-option>
+          </el-select>
+        </template>
+        <template v-slot:indicator="{ row }">
+          <el-select
+            v-if="row.businessType !== -1"
+            v-model="row.indicator"
+            placeholder="请选择考核指标"
+            :key="row.businessType"
+            @change="indicatorChange(row)"
+          >
+            <el-option
+              v-for="i in getIndicatorList(row.businessType)"
+              :key="i.indicator"
+              :label="i.indicatorName"
+              :value="i.indicator"
+            >
+            </el-option>
+          </el-select>
+          <el-input
+            v-else
+            v-model="row.indicatorName"
+            placeholder="请输入"
+          ></el-input>
+        </template>
+        <template v-slot:indicatorName="{ row }">
+          <el-select
+            v-if="row.businessType !== -1"
+            v-model="row.mainIndicatorId"
+            placeholder="请选择指标名称"
+            :key="row.indicator"
+            @change="mainIndicatorIdChange(row)"
+          >
+            <el-option
+              v-for="i in getMainIndicatorIdList(
+                row.businessType,
+                row.indicator
+              )"
+              :key="i.id"
+              :label="i.name"
+              :value="i.id"
+            >
+            </el-option>
+          </el-select>
+          <el-input
+            v-else
+            v-model="row.mainIndicatorName"
+            placeholder="请输入"
+          ></el-input>
+        </template>
+        <template v-slot:isAutoCheck="{ row }">
+          <el-select
+            v-model="row.isAutoCheck"
+            placeholder="请选择"
+            :disabled="row.businessType === -1"
+          >
+            <el-option label="自动" :value="1"> </el-option>
+            <el-option label="手动" :value="0"> </el-option>
+          </el-select>
+        </template>
+        <template v-slot:action="{ row }">
+          <div>
+            <el-link type="danger" @click="deleteRow(row)">删除</el-link>
+          </div>
+        </template>
+      </ele-pro-table> -->
+
       <header-title title="质检放行规则">
         <el-button type="primary" icon="el-icon-plus" @click="addDetails(2)">
           添加规则指标

src/views/material/BOMmanage/components/workingProcedure.vue

@@ -374,6 +374,17 @@
               </el-col>
             </el-row>
 
+            <el-row>
+              <el-col :span="24" label-width="100px">
+                <el-form-item label="计价类型" prop="pricingType">
+                  <el-radio-group v-model="beatParam.pricingType">
+                    <el-radio :label="1" :disabled="isView">计时</el-radio>
+                    <el-radio :label="2" :disabled="isView">计件</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
             <el-row>
               <el-col :span="16" label-width="100px">
                 <el-form-item label="工时单价" prop="taskPrice">
@@ -1437,8 +1448,6 @@
 
           this.tableData.taskParam[this.currentIndex].materialQuota = res.data;
 
-
-
           console.log(this.tableData, 'this.tableData');
         });
         // this.$refs.bomDetailList.open(this.resourceBomId, this.level)
@@ -1929,8 +1938,8 @@
 
         this.baseCount2 = rowData.baseCount2;
         this.baseCountUnit2 = rowData.baseCountUnit2;
-   this.ncCodeList =
-            this.tableData.taskParam[this.currentIndex].ncCodeList || [];
+        this.ncCodeList =
+          this.tableData.taskParam[this.currentIndex].ncCodeList || [];
         this.visible = true;
         setTimeout(() => {
           console.log(this.$refs);

src/views/technology/production/index.vue

@@ -284,6 +284,14 @@
             showOverflowTooltip: true,
             minWidth: 110
           },
+          {
+            align: 'center',
+            prop: 'version',
+            slot: 'version',
+            label: '版本',
+            showOverflowTooltip: true,
+            minWidth: 110
+          },
           {
             align: 'center',
             prop: 'gui',
@@ -350,7 +358,7 @@
           {
             value: 6,
             label: '质检工序'
-          },
+          }
           // {
           //   value: 7,
           //   label: '生产准备'

vue.config.js

@@ -35,10 +35,10 @@ module.exports = {
         // target: 'http://192.168.1.3:18086',
         // target: 'http://192.168.1.158:18086',
         // target: 'http://192.168.1.176:18086',
-        target: 'http://192.168.1.125:18086',
-        // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186',
+        target: 'http://192.168.1.125:18086',
+        // target: 'http://192.168.1.251:18186',
         // target: 'http://192.168.1.125:18086',
         // target: 'http://192.168.1.251:18186', // 测试环境
         // target: 'http://192.168.1.251:18087',